Skip to content

Commit 47675b6

Browse files
magento-engcom-teammagento-engcom-team
authored
[Magento Community Engineering] Community Contributions - 2.4-develop-expedited-prs
 - merged with '2.4-develop-express-lane-prs' branch
2 parents ce7d5be + 4cd8597 commit 47675b6

File tree

37 files changed

+201
-83
lines changed

37 files changed

+201
-83
lines changed

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

Lines changed: 19 additions & 0 deletions
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/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
9595
<click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
9696
<waitForPageLoad stepKey="waitForAttributeToSave"/>
97-
<click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
98-
<waitForPageLoad stepKey="waitForProductToSave"/>
97+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
9998
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
10099

101100
<!--Verify product attribute added in product form -->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@
8686
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
8787
<click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
8888
<waitForPageLoad stepKey="waitForAttributeToSave"/>
89-
<click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
90-
<waitForPageLoad stepKey="waitForProductToSave"/>
89+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
9190
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
9291

9392
<!--Run Re-Index task -->

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@
7474
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
7575
<click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
7676
<waitForPageLoad stepKey="waitForAttributeToSave"/>
77-
<click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
78-
<waitForPageLoad stepKey="waitForProductToSave"/>
77+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
7978

8079
<!--Verify product attribute added in product form and Is Required message displayed-->
8180
<scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
@@ -85,8 +84,7 @@
8584
<!--Fill the Required field and save the product -->
8685
<fillField selector="{{AdminProductFormSection.attributeRequiredInput(newProductAttribute.attribute_code)}}" userInput="attribute" stepKey="fillTheAttributeRequiredInputField"/>
8786
<scrollToTopOfPage stepKey="scrollToTopOfProductFormPage"/>
88-
<click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct1"/>
89-
<waitForPageLoad stepKey="waitForProductToSave1"/>
87+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct1"/>
9088
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
9189
</test>
9290
</tests>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
4343
<fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
4444
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
45-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
46-
<waitForPageLoad stepKey="waitForSimpleProductToSave"/>
45+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
4746
<!-- Verify customer see success message -->
4847
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
4948

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
3535
<fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillProductSku"/>
3636
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
37-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
38-
<waitForPageLoad stepKey="waitForVirtualProductSaved" />
37+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
3938

4039
<!-- Verify we see success message -->
4140
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
6262
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
6363
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
64-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
65-
<waitForPageLoad stepKey="waitForVirtualProductSaved"/>
64+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
6665

6766
<!-- Verify we see success message -->
6867
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@
111111
<selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
112112
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
113113
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
114-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
115-
<waitForPageLoad stepKey="waitForVirtualProductSaved"/>
114+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
116115

117116
<!-- Verify we see success message -->
118117
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
5454
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
5555
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
56-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
57-
<waitForPageLoad stepKey="waitForVirtualProductSaved"/>
56+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
5857

5958
<!-- Verify we see success message -->
6059
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
5252
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
5353
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
54-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
55-
<waitForPageLoad stepKey="waitForVirtualProductSaved"/>
54+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
5655

5756
<!-- Verify we see success message -->
5857
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@
7878
<click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
7979
<click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
8080
<waitForPageLoad stepKey="waitForApplyCategory"/>
81-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
82-
<waitForPageLoad stepKey="waitForSavingChanges"/>
81+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSave"/>
8382

8483
<!-- Enable `Use Categories Path for Product URLs` on Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -->
8584
<amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="onConfigPage"/>
@@ -109,8 +108,7 @@
109108
<checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
110109
<click selector="{{AdminProductFormSection.done}}" stepKey="pressButtonDone"/>
111110
<waitForPageLoad stepKey="waitForApplyCategory2"/>
112-
<click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
113-
<waitForPageLoad stepKey="waitForSavingProduct"/>
111+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="pushButtonSave"/>
114112

115113
<!--Product is saved -->
116114
<see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
@@ -181,8 +179,7 @@
181179
<click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
182180
<click selector="{{AdminProductFormSection.done}}" stepKey="clickButtonDone"/>
183181
<waitForPageLoad stepKey="waitForCategoryApply"/>
184-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
185-
<waitForPageLoad stepKey="waitForSaveChanges"/>
182+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
186183

187184
<!-- Product is saved successfully -->
188185
<see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSaveMessage"/>

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

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

6464
<!-- Update default simple product with name -->
6565
<fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductDataOverriding.name}}" stepKey="fillSimpleProductName"/>
66-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
67-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
66+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
6867

6968
<!-- Verify customer see success message -->
7069
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

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

6262
<!-- Update default simple product with price -->
6363
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductDataOverriding.price}}" stepKey="fillSimpleProductPrice"/>
64-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
65-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
64+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
6665

6766
<!-- Verify customer see success message -->
6867
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
7878
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductTierPrice300InStock.urlKey}}" stepKey="fillUrlKey"/>
7979
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
80-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
81-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
80+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
8281

8382
<!-- Verify customer see success message -->
8483
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductDisabled.urlKey}}" stepKey="fillUrlKey"/>
5353
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
5454
<click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickEnableProductLabelToDisableProduct"/>
55-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
56-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
55+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
5756

5857
<!-- Verify customer see success message -->
5958
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@
7171
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
7272
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductEnabledFlat.urlKey}}" stepKey="fillUrlKey"/>
7373
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
74-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
75-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
74+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
7675

7776
<!-- Verify customer see success message -->
7877
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
6363
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductNotVisibleIndividually.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
6464
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
65-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
66-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
65+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
6766

6867
<!-- Verify customer see success message -->
6968
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
<click selector="{{AdminProductFormSection.unselectCategories($$initialCategoryEntity.name$$)}}" stepKey="unselectCategories"/>
4848
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategory"/>
4949
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
50-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
51-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
50+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
5251

5352
<!-- Verify customer see success message -->
5453
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
6363
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
6464
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
65-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
66-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
65+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
6766

6867
<!-- Verify customer see success message -->
6968
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
6363
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="fillUrlKey"/>
6464
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
65-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
66-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
65+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
6766

6867
<!-- Verify customer see success message -->
6968
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@
6262
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
6363
<fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice325InStock.urlKey}}" stepKey="fillUrlKey"/>
6464
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
65-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
66-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
65+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
6766

6867
<!-- Verify customer see success message -->
6968
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@
7575
<selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_price_type}}" stepKey="selectOptionPriceType"/>
7676
<fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_sku}}" stepKey="fillOptionSku"/>
7777
<scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
78-
<click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
79-
<waitForPageLoad stepKey="waitForSimpleProductSave"/>
78+
<actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
8079

8180
<!--Verify customer see success message-->
8281
<see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>

0 commit comments

Comments
 (0)