Skip to content

Commit 4a85960

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'mainline-ce/2.4-develop' into MC-35827-2
2 parents ebefd61 + e32b85d commit 4a85960

File tree

376 files changed

+6479
-1232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+6479
-1232
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,11 @@
8989
<waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
9090
<see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
9191
<see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
92-
<click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
92+
<actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
9393
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
9494
<!--Create Shipment for the order-->
9595
<comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
96-
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage2"/>
97-
<waitForPageLoad time="30" stepKey="waitForOrderListPageLoading"/>
96+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage2"/>
9897
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrderPageForShip"/>
9998
<click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
10099
<waitForPageLoad stepKey="waitForShipmentPagePage"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
</after>
3232

3333
<!-- Create a bundle product -->
34-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
35-
<waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
34+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
3635
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
3736
<argument name="product" value="BundleProduct"/>
3837
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@
4040
<amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
4141
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
4242
<!-- Search for the product by sku -->
43-
<fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDynamicBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
44-
<waitForPageLoad stepKey="waitForSearchButton"/>
45-
<click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
46-
<waitForPageLoad stepKey="waitForSearchResults"/>
43+
<actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
44+
<argument name="query" value="$$createDynamicBundleProduct.sku$$"/>
45+
</actionGroup>
4746
<!-- Should not see any search results -->
4847
<dontSee userInput="$$createDynamicBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
4948
<see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@
3737
<amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
3838
<see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
3939
<!-- Search for the product by sku -->
40-
<fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createFixedBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
41-
<waitForPageLoad stepKey="waitForSearchButton"/>
42-
<click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
43-
<waitForPageLoad stepKey="waitForSearchResults"/>
40+
<actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
41+
<argument name="query" value="$$createFixedBundleProduct.sku$$"/>
42+
</actionGroup>
4443
<!-- Should not see any search results -->
4544
<dontSee userInput="$$createFixedBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
4645
<see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
</after>
3838

3939
<!-- Create a bundle product -->
40-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
41-
<waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
40+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
4241
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
4342
<argument name="product" value="BundleProduct"/>
4443
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
</after>
3636

3737
<!-- Create a bundle product -->
38-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
39-
<waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
38+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
4039
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
4140
<argument name="product" value="BundleProduct"/>
4241
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@
7676
<seeElement stepKey="LookingForNameOfProduct" selector="{{StorefrontBundledSection.bundleProductName}}"/>
7777

7878
<!--Testing disabled view-->
79-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="GoToProductCatalog"/>
80-
<waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
79+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="GoToProductCatalog"/>
8180
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="FindProductEditPage">
8281
<argument name="product" value="BundleProduct"/>
8382
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535

3636
<!-- Create a product to appear in the widget, fill in basic info first -->
3737

38-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
39-
<waitForPageLoad stepKey="waitForProductList"/>
38+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
4039
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
4140
<click selector="{{AdminProductGridActionSection.addBundleProduct}}" stepKey="clickAddBundleProduct"/>
4241
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
</after>
5454

5555
<!-- Start creating a bundle product -->
56-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
57-
<waitForPageLoad stepKey="waitForProductList"/>
56+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
5857
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
5958
<argument name="product" value="BundleProduct"/>
6059
</actionGroup>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
</after>
3232

3333
<!-- Create a bundle product -->
34-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
35-
<waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
34+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
3635
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
3736
<argument name="product" value="BundleProduct"/>
3837
</actionGroup>
@@ -84,8 +83,7 @@
8483
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
8584

8685
<!-- Find the product that we just created using the product grid -->
87-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
88-
<waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
86+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
8987
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
9088
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
9189
<argument name="product" value="BundleProduct"/>

0 commit comments

Comments
 (0)