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

+2-3
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

+1-2
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

+3-4
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

+3-4
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+1-2
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

+2-4
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"/>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
</after>
3131

3232
<!-- Start creating a bundle product -->
33-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
34-
<waitForPageLoad stepKey="waitForProductList"/>
33+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
3534
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
3635
<argument name="product" value="BundleProduct"/>
3736
</actionGroup>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
</after>
3232

3333
<!-- Start creating a bundle product -->
34-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
35-
<waitForPageLoad stepKey="waitForProductList"/>
34+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
3635
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
3736
<argument name="product" value="BundleProduct"/>
3837
</actionGroup>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</after>
3737

3838
<!-- Start creating a bundle product -->
39-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
40-
<waitForPageLoad stepKey="waitForProductList"/>
39+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
4140
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
4241
<argument name="product" value="BundleProduct"/>
4342
</actionGroup>

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

+1-2
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/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="AdminOpenProductIndexPageActionGroup">
11+
<annotations>
12+
<description>Go to products grid page.</description>
13+
</annotations>
1114
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndexPage"/>
1215
<waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
1316
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveButtonClickActionGroup.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminProductFormSaveButtonClickActionGroup">
12+
<annotations>
13+
<description>Click Save button of product form.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
17+
<waitForPageLoad stepKey="waitForProductSaved"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
1313
<element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
1414
<element name="useDefaultUrl" type="checkbox" selector="input[name='use_default[url_key]']"/>
15+
<element name="urlKeyRedirectCheckbox" type="checkbox" selector="input[name='product[url_key_create_redirect]']"/>
1516
<element name="metaTitleInput" type="input" selector="input[name='product[meta_title]']"/>
1617
<element name="metaKeywordsInput" type="textarea" selector="textarea[name='product[meta_keyword]']"/>
1718
<element name="metaDescriptionInput" type="textarea" selector="textarea[name='product[meta_description]']"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
</after>
2727

2828
<!--Create product-->
29-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
30-
<waitForPageLoad stepKey="waitForProductIndexPage"/>
29+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
3130
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
3231
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateSimpleProduct">
3332
<argument name="product" value="SimpleProduct3"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
</after>
2727

2828
<!--Create product-->
29-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
30-
<waitForPageLoad stepKey="waitForProductIndexPage"/>
29+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
3130
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
3231
<actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
3332
<argument name="product" value="defaultVirtualProduct"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3535
</after>
3636
<!--Open Product Index Page and filter the product-->
37-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
38-
<waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
37+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
3938
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
4039
<argument name="product" value="SimpleProduct"/>
4140
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml

+5-10
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
<deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>
3232
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
3333
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
34-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
35-
<waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
34+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex1"/>
3635
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
3736
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
3837
</after>
@@ -69,8 +68,7 @@
6968
<seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_2"/>
7069
<seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_2"/>
7170
<!--Case: Tier Price for General Customer Group-->
72-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
73-
<waitForPageLoad time="30" stepKey="waitForProductPageToLoad1"/>
71+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
7472
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
7573
<argument name="product" value="$$createSimpleProduct$$"/>
7674
</actionGroup>
@@ -94,8 +92,7 @@
9492
<seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_4"/>
9593
<seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_3"/>
9694
<!--Case: Tier Price applied if Product quantity meets Tier Price Condition-->
97-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex3"/>
98-
<waitForPageLoad time="30" stepKey="waitForProductPageToLoad2"/>
95+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex3"/>
9996
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
10097
<argument name="product" value="$$createSimpleProduct$$"/>
10198
</actionGroup>
@@ -160,8 +157,7 @@
160157
<actualResult type="variable">grabTextFromSubtotalField3</actualResult>
161158
</assertEquals>
162159
<!--Tier Price is changed in Shopping Cart and is changed on Product page if Tier Price parameters are changed in Admin-->
163-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex4"/>
164-
<waitForPageLoad time="30" stepKey="waitForProductPageToLoa4"/>
160+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex4"/>
165161
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
166162
<argument name="product" value="$$createSimpleProduct$$"/>
167163
</actionGroup>
@@ -225,8 +221,7 @@
225221
<seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '75')}}" stepKey="assertProductTierPriceAmountForSecondRow2"/>
226222
<seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
227223
<seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '25')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
228-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex5"/>
229-
<waitForPageLoad time="30" stepKey="waitForProductPageToLoad3"/>
224+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex5"/>
230225
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct5">
231226
<argument name="product" value="$$createSimpleProduct$$"/>
232227
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<after>
2828
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
2929
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
30-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
31-
<waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
30+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
3231
<actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
3332
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
3433
</after>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@
146146
<see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct3.price$$" stepKey="seeChildProduct3PriceInStoreFront"/>
147147

148148
<!-- Open Product Index Page and Filter First Child product -->
149-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
150-
<waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
149+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
151150
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
152151
<argument name="product" value="ApiSimpleOne"/>
153152
</actionGroup>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
</after>
3636
<!--Open Product Index Page and filter the product-->
3737
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
38+
3839
<actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
3940
<argument name="product" value="SimpleProduct"/>
4041
</actionGroup>

0 commit comments

Comments
 (0)