Skip to content

Commit db47d6c

Browse files
avattam06avattam06
authored
Merge branch '2.4-develop' into paypalflowpro-graphql
2 parents 05e9e4e + 00f8a8c commit db47d6c

File tree

695 files changed

+29168
-1259
lines changed

Some content is hidden

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

695 files changed

+29168
-1259
lines changed

‎.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ For more detailed information on contribution please read our [beginners guide](
2323
* Unit/integration test coverage
2424
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
2525
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
26-
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
26+
5. All automated tests must pass.
2727

2828
## Contribution process
2929

‎.htaccess

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,6 @@
238238
Require all denied
239239
</IfVersion>
240240
</Files>
241-
<Files .travis.yml>
242-
<IfVersion < 2.4>
243-
order allow,deny
244-
deny from all
245-
</IfVersion>
246-
<IfVersion >= 2.4>
247-
Require all denied
248-
</IfVersion>
249-
</Files>
250241
<Files CHANGELOG.md>
251242
<IfVersion < 2.4>
252243
order allow,deny

‎.htaccess.sample

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,15 +238,6 @@
238238
Require all denied
239239
</IfVersion>
240240
</Files>
241-
<Files .travis.yml>
242-
<IfVersion < 2.4>
243-
order allow,deny
244-
deny from all
245-
</IfVersion>
246-
<IfVersion >= 2.4>
247-
Require all denied
248-
</IfVersion>
249-
</Files>
250241
<Files CHANGELOG.md>
251242
<IfVersion < 2.4>
252243
order allow,deny

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</actionGroup>
7171

7272
<!--Save the product-->
73-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
73+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7474
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
7575

7676
<!--Checking on admin side-->
@@ -117,7 +117,7 @@
117117
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '3')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty2"/>
118118

119119
<!--Save the product-->
120-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
120+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
121121
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
122122

123123
<!--Checking on admin side-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
5050

5151
<!--save the product/published by default-->
52-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
52+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5353
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
5454

5555
<!--Testing that price appears correctly in admin catalog-->
@@ -70,7 +70,7 @@
7070
<click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet2"/>
7171

7272
<!--save the product/published by default-->
73-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
73+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
7474
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
7575

7676
<!--Testing that price appears correctly in admin catalog-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="countryOfManufactureDropDown"/>
144144

145145
<!--Save the product-->
146-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
146+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
147147
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
148148

149149
<!--Verify form was filled out correctly after edit-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111

112112
<!-- Save product form -->
113113
<actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveProduct"/>
114-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveWithTwoOptions"/>
114+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveWithTwoOptions"/>
115115
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
116116

117117
<!-- Delete created bundle product -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
5858

5959
<!--Save the product-->
60-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
60+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6161
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6262

6363
<!--Go to catalog deletion page-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</actionGroup>
5252

5353
<!--Save the product-->
54-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
54+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
5555
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
5656

5757
<actionGroup ref="AddRelatedProductBySkuActionGroup" stepKey="addRelatedProduct1">
@@ -62,7 +62,7 @@
6262
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
6363

6464
<!--Save the product-->
65-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
65+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAfterEdit"/>
6666
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
6767

6868
<!--See related product in admin-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
5858

5959
<!--Save the product-->
60-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
60+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6161
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6262

6363
<!--Apply Bundle Product Filter-->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</actionGroup>
6868

6969
<!--Save the product-->
70-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
70+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7171
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7272

7373
<!--Creating Second bundle product-->
@@ -107,7 +107,7 @@
107107
<fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
108108

109109
<!--Save the product-->
110-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
110+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
111111
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
112112

113113
<!--Mass delete bundle products-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</actionGroup>
6767

6868
<!--save the product/published by default-->
69-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
69+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7070
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7171

7272
<!-- go to page-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<fillField userInput="{{BundleProduct.fixedPrice}}" selector="{{AdminProductFormBundleSection.priceField}}" stepKey="fillPrice"/>
7474

7575
<!--Save the product-->
76-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
76+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7777
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7878

7979
<!--Testing that price appears correctly in admin catalog-->

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</actionGroup>
6666

6767
<!--Save the product-->
68-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
68+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6969
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7070

7171
<!--Testing enabled view-->
@@ -82,8 +82,7 @@
8282
</actionGroup>
8383
<click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="ClickProductInGrid"/>
8484
<click stepKey="ClickOnEnableDisableToggle" selector="{{AdminProductFormBundleSection.enableDisableToggle}}"/>
85-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
86-
<waitForPageLoad stepKey="PauseForSave"/>
85+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
8786
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
8887
<amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
8988
<waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
6565

6666
<!--Save the product-->
67-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
67+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6868
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6969

7070
<!--Creating Second bundle product-->
@@ -105,7 +105,7 @@
105105
<fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
106106

107107
<!--Save the product-->
108-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
108+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
109109
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
110110

111111
<!--Clear Filters-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
6464
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="1" stepKey="fillProductDefaultQty1"/>
6565
<fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="1" stepKey="fillProductDefaultQty2"/>
66-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
66+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
6767

6868
<!-- If PageCache is enabled, Cache clearing happens here, via merge -->
6969

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</actionGroup>
7474

7575
<!--save the product-->
76-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
76+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
7777
<see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
7878

7979
<!--Checking details-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
7474

7575
<!--Save the product-->
76-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
76+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
7777
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
7878

7979
<magentoCron stepKey="runCronReindex" groups="index"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
6464

6565
<!--Save the product-->
66-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
66+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
6767
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
6868

6969
<!--Go to category page-->

‎app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class AjaxLoginTest extends TestCase
6363
/**
6464
* @var array
6565
*/
66-
protected $formIds;
66+
protected $formIds = ['user_login'];
6767

6868
/**
6969
* @var AjaxLogin
@@ -97,7 +97,6 @@ protected function setUp(): void
9797
->method('getCaptcha')
9898
->willReturn($this->captchaMock);
9999

100-
$this->formIds = ['user_login'];
101100
$this->serializerMock = $this->createMock(Json::class);
102101

103102
$this->model = new AjaxLogin(
@@ -194,7 +193,10 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
194193

195194
$this->captchaMock->expects($this->once())->method('isRequired')->with($username)
196195
->willReturn(false);
197-
$this->captchaMock->expects($this->never())->method('logAttempt')->with($username);
196+
$expectLogAttempt = $requestContent['captcha_form_id'] ?? false;
197+
$this->captchaMock
198+
->expects($expectLogAttempt ? $this->once() : $this->never())
199+
->method('logAttempt')->with($username);
198200
$this->captchaMock->expects($this->never())->method('isCorrect');
199201

200202
$closure = function () {

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveActionGroup.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="AdminProductFormSaveActionGroup">
12+
<annotations>
13+
<description>Click save button for saving product.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
17+
<waitForPageLoad stepKey="waitForProductSaving"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
<actionGroup ref="AddCrossSellProductBySkuActionGroup" stepKey="addProduct3ToSimp1">
5454
<argument name="sku" value="$simpleProduct3.sku$"/>
5555
</actionGroup>
56-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
57-
<waitForPageLoad stepKey="waitForPageLoad1"/>
56+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
5857

5958
<!-- Go to simpleProduct3, add simpleProduct1 and simpleProduct2 as cross-sell-->
6059
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProduct3">
@@ -68,8 +67,7 @@
6867
<actionGroup ref="AddCrossSellProductBySkuActionGroup" stepKey="addProduct2ToSimp3">
6968
<argument name="sku" value="$simpleProduct2.sku$"/>
7069
</actionGroup>
71-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave2"/>
72-
<waitForPageLoad stepKey="waitForPageLoad2"/>
70+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave2"/>
7371

7472
<!-- Go to frontend, add simpleProduct1 to cart-->
7573
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimp1ToCart">

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@
9898
<fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload3.height}}" stepKey="fillImageHeight2" />
9999
<click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn2" />
100100
<waitForPageLoad stepKey="waitForPageLoad6"/>
101-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
102-
<waitForLoadingMaskToDisappear stepKey="waitForLoading12" />
101+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
103102
<amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
104103
<waitForPageLoad stepKey="waitForPageLoad7"/>
105104
<seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@
5656
<selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="In Stock" stepKey="selectOutOfStock"/>
5757
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
5858
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
59-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
60-
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
59+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
6160
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
6261
<!--Clear cache and reindex-->
6362
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
<click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="closeAdvancedPricingPopup"/>
242242
<waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
243243
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
244-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
244+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
245245
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage4"/>
246246
<grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField7"/>
247247
<assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">

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

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

158158
<!-- Disable the product -->
159159
<click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProduct"/>
160-
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
161-
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
160+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
162161
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
163162

164163
<!-- Open Product Store Front Page -->

0 commit comments

Comments
 (0)