Skip to content

Commit a5170a4

Browse files
okolesnykokolesnyk
committed
Merge branch '2.4-develop' of github.com:magento/magento2ce into 2.4-develop
2 parents 835a772 + 1e28f35 commit a5170a4

File tree

233 files changed

+7020
-1047
lines changed

Some content is hidden

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

233 files changed

+7020
-1047
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminSuccessLoginActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
</annotations>
1515

1616
<waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible"/>
17+
<seeElement selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="assertAdminAccountTextElement"/>
1718
</actionGroup>
1819
</actionGroups>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@
8080
<waitForPageLoad stepKey="waitForElementAdded"/>
8181

8282
<!-- Go to the shopping cart page and grab the value of the option title -->
83-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
84-
<waitForPageLoad stepKey="waitForCartPageLoad"/>
83+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart"/>
8584
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
8685

8786
<!-- Find the product that we just created using the product grid -->
@@ -101,8 +100,7 @@
101100
<see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
102101

103102
<!-- Go to the shopping cart page and make sure the title has changed -->
104-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
105-
<waitForPageLoad stepKey="waitForCartPageLoad1"/>
103+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart1"/>
106104
<grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
107105
<assertNotEquals stepKey="assertNotEquals">
108106
<actualResult type="string">{$grabTotalAfter}</actualResult>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@
100100
<see selector="{{StorefrontMessagesSection.success}}" userInput="You added {{BundleProduct.name}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
101101

102102
<!-- Verify cart contents -->
103-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart"/>
104-
<waitForPageLoad stepKey="waitForCart"/>
103+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart"/>
105104
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('1')}}" userInput="Option One" stepKey="seeOption1"/>
106105
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('2')}}" userInput="Option Two" stepKey="seeOption2"/>
107106
<see selector="{{StorefrontBundledSection.nthItemOptionsTitle('3')}}" userInput="Option Three" stepKey="seeOption3"/>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@
8989
<waitForPageLoad stepKey="waitForElementAdded2"/>
9090

9191
<!-- Go to the shopping cart page and edit the first product -->
92-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
93-
<waitForPageLoad stepKey="waitForCartPageLoad"/>
92+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart"/>
9493
<waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
9594
<waitForPageLoad stepKey="waitForCartPageLoad3"/>
9695
<grabTextFrom selector="{{CheckoutCartSummarySection.total}}" stepKey="grabTotalBefore"/>
@@ -107,8 +106,7 @@
107106
<waitForPageLoad stepKey="waitForElementAdded3"/>
108107

109108
<!-- Go to the shopping cart page -->
110-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
111-
<waitForPageLoad stepKey="waitForCartPageLoad2"/>
109+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="onPageShoppingCart2"/>
112110

113111
<!-- Assert that the options are both there and the proce no longer matches -->
114112
<see stepKey="assertBothOptions" selector="{{CheckoutCartProductSection.nthItemOption('2')}}" userInput="$$simpleProduct1.sku$$"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
<actionGroup name="AdminSaveCategoryActionGroup">
1111
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryWithProducts"/>
1212
<waitForPageLoad stepKey="waitForCategorySaved"/>
13-
<see userInput="You saved the category." stepKey="seeSuccessMessage"/>
1413
</actionGroup>
15-
</actionGroups>
14+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategorySaveSuccessMessageActionGroup.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="AssertAdminCategorySaveSuccessMessageActionGroup">
12+
<annotations>
13+
<description>Checks success message after category was saved.</description>
14+
</annotations>
15+
16+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" time="30" stepKey="waitForElement"/>
17+
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the category." stepKey="seeSuccessMessage"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@
7777
</actionGroup>
7878

7979
<!-- Check that cart page contains cross-sell to simpleProduct2 and simpleProduct3-->
80-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToCart1"/>
81-
<waitForPageLoad stepKey="waitForCartToLoad"/>
80+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCart1"/>
8281
<waitForElementVisible selector="{{CheckoutCartCrossSellSection.products}}" stepKey="waitForCrossSellLoading"/>
8382
<see stepKey="seeProduct2InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct2.name$"/>
8483
<see stepKey="seeProduct3InCrossSell" selector="{{CheckoutCartCrossSellSection.products}}" userInput="$simpleProduct3.name$"/>

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@
171171
<fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="25" stepKey="selectProductTierPricePercentageValue2"/>
172172
<click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton4"/>
173173
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct4"/>
174-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage1"/>
175-
<waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad1"/>
174+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage1"/>
176175
<seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
177176
<grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField4"/>
178177
<assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField4">
@@ -198,8 +197,7 @@
198197
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
199198
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage1"/>
200199
<actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
201-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage2"/>
202-
<waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad2"/>
200+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage2"/>
203201
<seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_2"/>
204202
<grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField5"/>
205203
<assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField5">
@@ -212,8 +210,7 @@
212210
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
213211
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage2"/>
214212
<actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
215-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage3"/>
216-
<waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad3"/>
213+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage3"/>
217214
<seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_3"/>
218215
<grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField6"/>
219216
<assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField6">
@@ -250,8 +247,7 @@
250247
<waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
251248
<fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
252249
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
253-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="goToShoppingCartPage4"/>
254-
<waitForPageLoad time="30" stepKey="waitForShoppingCartPagePageLoad4"/>
250+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage4"/>
255251
<grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField7"/>
256252
<assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">
257253
<expectedResult type="string">$4,000.00</expectedResult>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
</actionGroup>
4242

4343
<!-- Go to the cart page and verify we see the product -->
44-
<amOnPage url="{{CheckoutCartPage.url}}" stepKey="gotoCart"/>
45-
<waitForPageLoad stepKey="waitForCartLoad"/>
44+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="gotoCart"/>
4645
<actionGroup ref="AssertStorefrontCheckoutCartItemsActionGroup" stepKey="assertProductItemInCheckOutCart">
4746
<argument name="productName" value="$$createProduct.name$$"/>
4847
<argument name="productSku" value="$$createProduct.sku$$"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
123123
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
124124
<waitForPageLoad stepKey="waitForCategorySaved"/>
125-
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
125+
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
126126
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
127127
<!--Open Category Store Front Page-->
128128
<comment userInput="Open Category Store Front Page" stepKey="commentOpenCategoryOnStorefront"/>

0 commit comments

Comments
 (0)