From 226e02401d5543078d78b221f75b7ae01e7994e0 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 2 Jul 2021 12:40:32 +0300
Subject: [PATCH 1/7]  refactored AdminApplyTierPriceToProductTest

---
 .../AdminDeleteTierPriceActionGroup.xml       |  18 ++
 ...ancedPricingUpdateTierPriceActionGroup.xml |  27 +++
 ...AdminProductFormAdvancedPricingSection.xml |   1 +
 .../AdminApplyTierPriceToProductTest.xml      | 229 +++++++++++-------
 .../AdminUpdateShoppingCartActionGroup.xml    |  19 ++
 ...ntChangeProductQtyInTheCartActionGroup.xml |  22 ++
 ...ontGoToCheckoutFromMinicartActionGroup.xml |  22 ++
 .../AdminEnableDisableMAPActionGroup.xml      |  19 ++
 ...ConfigurationSalesSalesMSRPActionGroup.xml |  16 ++
 .../frontend/Vendor/default/web/css/1.gif     | Bin 36 -> 0 bytes
 10 files changed, 292 insertions(+), 81 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml
 delete mode 100644 dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..317364185e850
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteTierPriceActionGroup">
+        <annotations>
+            <description>Deletes Tier price (first one if there are more than>1</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButtonFull}}" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..f4863b1dea421
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormAdvancedPricingUpdateTierPriceActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminProductFormAdvancedPricingUpdateTierPriceActionGroup" extends="AdminProductFormAdvancedPricingAddTierPriceActionGroup">
+        <annotations>
+            <description>Update the latest tier price on Advanced Pricing dialog on the Admin Product creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="website" type="string" defaultValue="All Websites [USD]"/>
+            <argument name="customerGroup" type="string" defaultValue="ALL GROUPS"/>
+            <argument name="quantity" type="string" defaultValue="1"/>
+            <argument name="priceType" type="string" defaultValue="Fixed"/>
+            <argument name="amount" type="string" defaultValue="10"/>
+        </arguments>
+
+        <remove keyForRemoval="waitForGroupPriceAddButtonAppears"/>
+        <remove keyForRemoval="clickCustomerGroupPriceAddButton"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
index 91ac52a91a4c4..771c579bf3da9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
@@ -12,6 +12,7 @@
         <element name="customerGroupPriceAddButton" type="button" selector="[data-action='add_new_row']" timeout="30"/>
         <element name="addCustomerGroupPrice" type="button" selector="//span[text()='Add']/ancestor::button" timeout="30"/>
         <element name="customerGroupPriceDeleteButton" type="button" selector="[data-action='remove_row']" timeout="30"/>
+        <element name="customerGroupPriceDeleteButtonFull" type="button" selector="(//tr//button[@data-action='remove_row'])" timeout="30"/>
         <element name="advancedPricingCloseButton" type="button" selector=".product_form_product_form_advanced_pricing_modal button.action-close" timeout="30"/>
         <element name="productTierPriceWebsiteSelect" type="select" selector="[name='product[tier_price][{{var1}}][website_id]']" parameterized="true"/>
         <element name="productTierPriceCustGroupSelect" type="select" selector="[name='product[tier_price][{{var1}}][cust_group]']" parameterized="true"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index 1ed079b12d1fd..daa29e24e25e8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -36,7 +36,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <!--Case: Group Price-->
+      
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
@@ -44,84 +44,122 @@
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton1"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForCustomerGroupPriceAddButton1"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent"/>
-        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="1" stepKey="fillProductTierPriceQtyInput1"/>
-        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('0')}}" userInput="Discount" stepKey="selectProductTierPriceValueType1"/>
-        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('0')}}" userInput="10" stepKey="selectProductTierPricePriceInput"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton1"/>
+       
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerGroupPriceAddButton1"/>
+        <actionGroup ref="AdminProductFormAdvancedPricingAddTierPriceActionGroup" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent">
+            <argument name="customerGroup" value="ALL GROUPS"/>
+            <argument name="quantity" value="1"/>
+            <argument name="priceType" value="Discount"/>
+            <argument name="amount" value="10"/>
+        </actionGroup> 
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductTierPriceQtyInput1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProductTierPriceValueType1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProductTierPricePriceInput"/>
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton1"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct1"/>
+
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin1">
             <argument name="Customer" value="$$createSimpleUSCustomer$$"/>
         </actionGroup>
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage1">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_1"/>
-        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="logoutCustomer1"/>
+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer1"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage2"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
+
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage2">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad3"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_2"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_2"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_2"/>
-        <!--Case: Tier Price for General Customer Group-->
+
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton2"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton2"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" time="30" stepKey="waitForSelectCustomerGroupNameAttribute1"/>
-        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="General" stepKey="selectCustomerGroupGeneral"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton2"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerGroupPriceAddButton2"/>
+        <actionGroup ref="AdminProductFormAdvancedPricingUpdateTierPriceActionGroup" stepKey="selectCustomerGroupGeneral">
+            <argument name="customerGroup" value="General"/>
+            <argument name="quantity" value="1"/>
+            <argument name="priceType" value="Discount"/>
+            <argument name="amount" value="10"/>
+        </actionGroup> 
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton2"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct2"/>
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage3"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
+
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage3">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad4"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_1"/>
         <dontSeeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_3"/>
+
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin2">
             <argument name="Customer" value="$$createSimpleUSCustomer$$"/>
         </actionGroup>
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage4"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage4">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad5"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_3"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_4"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_3"/>
-        <!--Case: Tier Price applied if Product quantity meets Tier Price Condition-->
+
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex3"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfPage3"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton3"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton3"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
-        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceCustGroupSelect('0')}}" userInput="ALL GROUPS" stepKey="selectCustomerGroupAllGroups"/>
-        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="15" stepKey="fillProductTierPriceQtyInput15"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="clickToLoseFocusOnRequiredInputElement"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="addCustomerGroupAllGroupsQty20PriceDiscountAnd18percent2"/>
-        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" userInput="20" stepKey="fillProductTierPriceQtyInput20"/>
-        <selectOption selector="{{AdminProductFormAdvancedPricingSection.productTierPriceValueTypeSelect('1')}}" userInput="Discount" stepKey="selectProductTierPriceValueType2"/>
-        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="18" stepKey="selectProductTierPricePriceInput18"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton3"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton3"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton3"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
+        <actionGroup ref="AdminProductFormAdvancedPricingUpdateTierPriceActionGroup" stepKey="selectCustomerGroupAllGroups">
+            <argument name="customerGroup" value="ALL GROUPS"/>
+            <argument name="quantity" value="15"/>
+            <argument name="priceType" value="Discount"/>
+            <argument name="amount" value="10"/>
+        </actionGroup> 
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductTierPriceQtyInput15"/>
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickToLoseFocusOnRequiredInputElement"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton3_1"/>
+        <actionGroup ref="AdminProductFormAdvancedPricingAddTierPriceActionGroup" stepKey="addCustomerGroupAllGroupsQty20PriceDiscountAnd18percent2">
+            <argument name="customerGroup" value="ALL GROUPS"/>
+            <argument name="quantity" value="20"/>
+            <argument name="priceType" value="Discount"/>
+            <argument name="amount" value="18"/>
+        </actionGroup> 
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton3"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct3"/>
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage5"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
+
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage5">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad6"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_2"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_1"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_1"/>
-        <amOnPage url="{{StorefrontCustomerLogoutPage.url}}" stepKey="logoutCustomer2"/>
+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer2"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
-        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage6"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
+
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage6">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad8"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_3"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_2"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_2"/>
-        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="goToProductPage1"/>
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage1">
+            <argument name="productUrl" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
         <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow1"/>
@@ -129,9 +167,10 @@
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '82')}}" stepKey="assertProductTierPriceAmountForSecondRow1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '18')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow1"/>
-        <fillField userInput="10" selector="{{StorefrontProductInfoMainSection.qty}}" stepKey="fillProductQuantity1"/>
-        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductQuantity1_"/>
+
+        <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="quantity" value="10"/>
         </actionGroup>
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToCheckoutFromMinicart"/>
         <seeInField userInput="10" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField10"/>
@@ -140,33 +179,47 @@
             <expectedResult type="string">$1,000.00</expectedResult>
             <actualResult type="variable">grabTextFromSubtotalField1</actualResult>
         </assertEquals>
-        <fillField userInput="15" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="fillProductQuantity2"/>
-        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton1"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
+       
+        <actionGroup ref="StorefrontChangeProductQtyInTheCartActionGroup" stepKey="fillProductQuantity2">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+            <argument name="qty" value="15"/>
+        </actionGroup>
+        <actionGroup ref="AdminUpdateShoppingCartActionGroup" stepKey="clickUpdateShoppingCartButton1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoadingMaskToDisappear1"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField2"/>
         <assertEquals message="Shopping cart should contain subtotal $1,350" stepKey="assertSubtotalField2">
             <expectedResult type="string">$1,350.00</expectedResult>
             <actualResult type="variable">grabTextFromSubtotalField2</actualResult>
         </assertEquals>
-        <fillField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="fillProductQuantity3"/>
-        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton2"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
+
+        <actionGroup ref="StorefrontChangeProductQtyInTheCartActionGroup" stepKey="fillProductQuantity1">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+            <argument name="qty" value="20"/>
+        </actionGroup>
+        <actionGroup ref="AdminUpdateShoppingCartActionGroup" stepKey="clickUpdateShoppingCartButton2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoadingMaskToDisappear2"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField3"/>
         <assertEquals message="Shopping cart should contain subtotal $1,640" stepKey="assertSubtotalField3">
             <expectedResult type="string">$1,640.00</expectedResult>
             <actualResult type="variable">grabTextFromSubtotalField3</actualResult>
         </assertEquals>
-        <!--Tier Price is changed in Shopping Cart and is changed on Product page if Tier Price parameters are changed in Admin-->
+       
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex4"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfPage4"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton4"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton4"/>
-        <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPricePercentageValuePriceInput('1')}}" userInput="25" stepKey="selectProductTierPricePercentageValue2"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton4"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton4"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton4"/>
+        <actionGroup ref="AdminProductFormAdvancedPricingUpdateTierPriceActionGroup" stepKey="selectProductTierPricePercentageValue2">
+            <argument name="customerGroup" value="ALL GROUPS"/>
+            <argument name="quantity" value="20"/>
+            <argument name="priceType" value="Discount"/>
+            <argument name="amount" value="25"/>
+        </actionGroup>   
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton4"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct4"/>
+
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage1"/>
         <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField4"/>
@@ -179,20 +232,23 @@
             <expectedResult type="string">$1,500.00</expectedResult>
             <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal1</actualResult>
         </assertEquals>
-        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart1"/>
-        <waitForElementVisible selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="waitForminiCartSubtotalField1"/>
+
+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForminiCartSubtotalField1"/>
         <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField"/>
         <assertEquals message="Mini shopping cart should contain subtotal $1,500" stepKey="assertSubtotalFieldFromMiniShoppingCart1">
             <expectedResult type="string">$1,500.00</expectedResult>
             <actualResult type="variable">grabTextFromMiniCartSubtotalField</actualResult>
         </assertEquals>
-        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab1"/>
-        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad1"/>
-        <uncheckOption selector="{{AdminSalesConfigSection.enableMAPUseSystemValue}}" stepKey="uncheckMAPUseSystemValue"/>
-        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="Yes" stepKey="setEnableMAPYes"/>
-        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig1"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage1"/>
+
+        <actionGroup ref="AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup" stepKey="navigateToAdminSalesConfigPageMAPTab1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminSalesConfigPageLoad1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="uncheckMAPUseSystemValue"/>
+        <actionGroup ref="AdminEnableDisableMAPActionGroup" stepKey="setEnableMAPYes"/>
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage2"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
+
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage2"/>
         <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_2"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField5"/>
@@ -200,12 +256,16 @@
             <expectedResult type="string">$1,500.00</expectedResult>
             <actualResult type="variable">grabTextFromSubtotalField5</actualResult>
         </assertEquals>
-        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab2"/>
-        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad2"/>
-        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="No" stepKey="setEnableMAPNo"/>
-        <click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig2"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="seeConfigSuccessMessage2"/>
+
+        <actionGroup ref="AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup" stepKey="navigateToAdminSalesConfigPageMAPTab2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminSalesConfigPageLoad2"/>
+        <actionGroup ref="AdminEnableDisableMAPActionGroup" stepKey="setEnableMAPNo">
+            <argument name="status" value="No"/>
+        </actionGroup>    
+        <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage1"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
+
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage3"/>
         <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_3"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField6"/>
@@ -213,7 +273,10 @@
             <expectedResult type="string">$1,500.00</expectedResult>
             <actualResult type="variable">grabTextFromSubtotalField6</actualResult>
         </assertEquals>
-        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="goToProductPage2"/>
+       
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage2">
+            <argument name="productUrl" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
         <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow2"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow2"/>
@@ -226,22 +289,25 @@
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfPage5"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton5"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButton}}" stepKey="waitForcustomerGroupPriceDeleteButton"/>
-        <scrollTo selector="(//*[contains(@class, 'product_form_product_form_advanced_pricing_modal')]//tr//button[@data-action='remove_row'])[1]" x="30" y="0" stepKey="scrollToDeleteFirstRowOfCustomerGroupPrice"/>
-        <click selector="(//tr//button[@data-action='remove_row'])[1]" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
-        <click selector="//tr//button[@data-action='remove_row']" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="clickDoneButton5"/>
+
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton5"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceDeleteButton"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToDeleteFirstRowOfCustomerGroupPrice"/>
+        <actionGroup ref="AdminDeleteTierPriceActionGroup" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
+        <actionGroup ref="AdminDeleteTierPriceActionGroup" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton5"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct5"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage6"/>
-        <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingButton6"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton6"/>
         <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton5"/>
         <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="dontSeeQtyInputOfFirstRow"/>
         <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" stepKey="dontSeeQtyInputOfSecondRow"/>
-        <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="closeAdvancedPricingPopup"/>
-        <waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
-        <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
+        <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="closeAdvancedPricingPopup"/>
+        <actionGroup ref="AdminFillProductPriceFieldAndPressEnterOnProductEditPageActionGroup" stepKey="fillProductPrice200">
+            <argument name="price" value="200"/>
+        </actionGroup>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
+
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage4"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField7"/>
         <assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">
@@ -253,8 +319,9 @@
             <expectedResult type="string">$4,000.00</expectedResult>
             <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal2</actualResult>
         </assertEquals>
-        <conditionalClick selector="{{StorefrontMinicartSection.showCart}}" dependentSelector="{{StorefrontMinicartSection.miniCartOpened}}" visible="false" stepKey="openMiniCart2"/>
-        <waitForElementVisible selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="waitForminiCartSubtotalField2"/>
+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForminiCartSubtotalField2"/>
+
         <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField2"/>
         <assertEquals message="Mini shopping cart should contain subtotal $4,000" stepKey="assertSubtotalFieldFromMiniShoppingCart2">
             <expectedResult type="string">$4,000.00</expectedResult>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml
new file mode 100644
index 0000000000000..f32cd6c47a7a3
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminUpdateShoppingCartActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminUpdateShoppingCartActionGroup">
+        <annotations>
+            <description>Click the "Update" button on the Shopping Cart page</description>
+        </annotations>
+
+        <click selector="{{CheckoutCartProductSection.updateShoppingCartButton}}" stepKey="clickUpdateShoppingCartButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml
new file mode 100644
index 0000000000000..d61c0e9d0be20
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontChangeProductQtyInTheCartActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontChangeProductQtyInTheCartActionGroup">
+        <annotations>
+            <description>Changes Product Qty in the Cart</description>
+        </annotations>
+        <arguments>
+            <argument name="qty" type="string"/>
+            <argument name="productName" type="string"/>
+        </arguments>
+
+        <fillField userInput="{{qty}}" selector="{{CheckoutCartProductSection.ProductQuantityByName(productName)}}" stepKey="fillProductQuantity"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml
new file mode 100644
index 0000000000000..fcf03b6d5bd3a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontGoToCheckoutFromMinicartActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontGoToCheckoutFromMinicartActionGroup" extends="GoToCheckoutFromMinicartActionGroup">
+        <annotations>
+            <description>Extends GoToCheckoutFromMinicartActionGroup.
+                         Clicks on the Storefront Mini Shopping Cart icon.
+                         Clicks on 'Proceed to Checkout'.
+                         Waits for page loaded.
+            </description>
+        </annotations>
+        
+        <waitForPageLoad stepKey="waitForCheckoutIsLoaded" after="goToCheckout"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml
new file mode 100644
index 0000000000000..51e3c274926fc
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDisableMAPActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminEnableDisableMAPActionGroup">
+        <arguments>
+            <argument name="status" type="string" defaultValue="Yes"/>
+        </arguments>
+
+        <uncheckOption selector="{{AdminSalesConfigSection.enableMAPUseSystemValue}}" stepKey="uncheckMAPUseSystemValue"/>
+        <selectOption selector="{{AdminSalesConfigSection.enableMAPSelect}}" userInput="{{status}}" stepKey="setEnableMAPYes"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml
new file mode 100644
index 0000000000000..bbb2d35ad1c5e
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup">
+
+        <amOnPage url="{{AdminSalesConfigPage.url('#sales_msrp-link')}}" stepKey="navigateToAdminSalesConfigPageMAPTab1"/>
+        <waitForPageLoad time="30" stepKey="waitForAdminSalesConfigPageLoad1"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif
deleted file mode 100644
index 14cc3b724458c007809364b487101503c7a60de3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
ocmZ?wbh9u|WMW`p_`tyM|Nnmm1_m7<W&nveFfq5}vocr%0GsXyL;wH)


From 6d145ed7452e23c6d405c8daff7bacb9d5a7c04b Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 2 Jul 2021 15:49:48 +0300
Subject: [PATCH 2/7] refactored

---
 .../AdminDeleteTierPriceActionGroup.xml            |   2 +-
 .../design/frontend/Vendor/default/web/css/1.gif   | Bin 0 -> 36 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
index 317364185e850..0e98c51757162 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteTierPriceActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteTierPriceActionGroup">
         <annotations>
-            <description>Deletes Tier price (first one if there are more than>1</description>
+            <description>Deletes Tier price (first one if there are >1)</description>
         </annotations>
 
         <click selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceDeleteButtonFull}}" userInput=".product_form_product_form_advanced_pricing_modal" stepKey="deleteFirstRowOfCustomerGroupPrice"/>
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif b/dev/tests/integration/testsuite/Magento/Theme/Model/_files/design/frontend/Vendor/default/web/css/1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14cc3b724458c007809364b487101503c7a60de3
GIT binary patch
literal 36
ocmZ?wbh9u|WMW`p_`tyM|Nnmm1_m7<W&nveFfq5}vocr%0GsXyL;wH)

literal 0
HcmV?d00001


From 4d2593b445f948f2102a30f98090cf46bc45cdf3 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Mon, 5 Jul 2021 09:36:30 +0300
Subject: [PATCH 3/7] Missing stepKeys added

---
 .../AdminApplyTierPriceToProductTest.xml              | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index daa29e24e25e8..0d5d78918ec21 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -86,7 +86,8 @@
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton2"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerGroupPriceAddButton2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSelectCustomerGroupNameAttribute1"/>
         <actionGroup ref="AdminProductFormAdvancedPricingUpdateTierPriceActionGroup" stepKey="selectCustomerGroupGeneral">
             <argument name="customerGroup" value="General"/>
             <argument name="quantity" value="1"/>
@@ -137,6 +138,9 @@
             <argument name="priceType" value="Discount"/>
             <argument name="amount" value="18"/>
         </actionGroup> 
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="fillProductTierPriceQtyInput20"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="selectProductTierPriceValueType2"/>
+        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="selectProductTierPricePriceInput18"/>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton3"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct3"/>
 
@@ -167,7 +171,7 @@
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '82')}}" stepKey="assertProductTierPriceAmountForSecondRow1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow1"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '18')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow1"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductQuantity1_"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductQuantity1"/>
 
         <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="addToCartFromStorefrontProductPage">
             <argument name="quantity" value="10"/>
@@ -192,7 +196,7 @@
             <actualResult type="variable">grabTextFromSubtotalField2</actualResult>
         </assertEquals>
 
-        <actionGroup ref="StorefrontChangeProductQtyInTheCartActionGroup" stepKey="fillProductQuantity1">
+        <actionGroup ref="StorefrontChangeProductQtyInTheCartActionGroup" stepKey="fillProductQuantity3">
             <argument name="productName" value="$$createSimpleProduct.name$$"/>
             <argument name="qty" value="20"/>
         </actionGroup>
@@ -303,6 +307,7 @@
         <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="dontSeeQtyInputOfFirstRow"/>
         <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" stepKey="dontSeeQtyInputOfSecondRow"/>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="closeAdvancedPricingPopup"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
         <actionGroup ref="AdminFillProductPriceFieldAndPressEnterOnProductEditPageActionGroup" stepKey="fillProductPrice200">
             <argument name="price" value="200"/>
         </actionGroup>

From e38d9bde73a22fa386e2e6e1669326cd49a9770b Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 10 Sep 2021 11:26:34 +0300
Subject: [PATCH 4/7] added new Action Groups

---
 ...orYEachAndSaveZMessageOnPDPActionGroup.xml |  27 ++
 ...torefrontAssertCartSubtotalActionGroup.xml |  24 ++
 ...frontAssertMiniCartSubtotalActionGroup.xml |  25 ++
 .../StorefrontAssertPriceOnPLPActionGroup.xml |  22 ++
 ...ertProductSubtotalInTheCartActionGroup.xml |  24 ++
 ...AssertXAsLowAsYMessageOnPLPActionGroup.xml |  25 ++
 ...tXRegularPriceYMessageOnPLPActionGroup.xml |  25 ++
 .../AdminApplyTierPriceToProductTest.xml      | 308 ++++++++++--------
 ...frontAssertProductQtyInCartActionGroup.xml |  22 ++
 9 files changed, 363 insertions(+), 139 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml
new file mode 100644
index 0000000000000..e042e742fd93a
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup">
+        <annotations>
+            <description>Asserts the "Buy X for Y each and save Z" message on PDP</description>
+        </annotations>
+        <arguments>
+            <argument name="priceIndex" type="string" defaultValue="1"/>
+            <argument name="X" type="string" defaultValue=""/>
+            <argument name="Y" type="string" defaultValue=""/>
+            <argument name="Z" type="string" defaultValue=""/>
+        </arguments>
+       
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel(priceIndex, X)}}" stepKey="assertBuyX"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount(priceIndex, Y)}}" stepKey="assertForY"/>
+        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount(priceIndex, Z)}}" stepKey="assertSaveZ"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml
new file mode 100644
index 0000000000000..ad31958a0f78d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCartSubtotalActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertCartSubtotalActionGroup">
+        <annotations>
+            <description>Asserts Cart Subtotal matches expected Value</description>
+        </annotations>
+        <arguments>
+            <argument name="expectedSubtotal" type="string"/>
+        </arguments>
+        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabCartSubtotal"/>
+        <assertEquals message="Shopping cart summary section should contain {{expectedSubtotal}}" stepKey="assertSubtotal">
+            <expectedResult type="string">{{expectedSubtotal}}</expectedResult>
+            <actualResult type="variable">grabCartSubtotal</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml
new file mode 100644
index 0000000000000..bebd7ba99b95c
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertMiniCartSubtotalActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertMiniCartSubtotalActionGroup">
+        <annotations>
+            <description>Asserts MiniCart Subtotal matches expected value</description>
+        </annotations>
+        <arguments>
+            <argument name="expectedSubtotal" type="string"/>
+        </arguments>
+
+        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField"/>
+        <assertEquals message="Mini shopping cart should contain subtotal {{expectedSubtotal}}" stepKey="assertSubtotal">
+            <expectedResult type="string">{{expectedSubtotal}}</expectedResult>
+            <actualResult type="variable">grabTextFromMiniCartSubtotalField</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml
new file mode 100644
index 0000000000000..3d43eb4c1e39b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertPriceOnPLPActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertPriceOnPLPActionGroup">
+        <annotations>
+            <description>Asserts product price on PLP</description>
+        </annotations>
+        <arguments>
+            <argument name="price" type="string"/>
+        </arguments>
+       
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal(price)}}" stepKey="assertProductPrice"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml
new file mode 100644
index 0000000000000..ec347c0b08d0f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductSubtotalInTheCartActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductSubtotalInTheCartActionGroup">
+        <annotations>
+            <description>Asserts Product Subtotal in the Cart matches expected Value</description>
+        </annotations>
+        <arguments>
+            <argument name="expectedSubtotal" type="string"/>
+        </arguments>
+        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabSubtotal"/>
+        <assertEquals message="Shopping cart should contain subtotal for product {{expectedSubtotal}}" stepKey="assertSubtotal">
+            <expectedResult type="string">{{expectedSubtotal}}</expectedResult>
+            <actualResult type="variable">grabSubtotal</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml
new file mode 100644
index 0000000000000..7e22e0550e36d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXAsLowAsYMessageOnPLPActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertXAsLowAsYMessageOnPLPActionGroup">
+        <annotations>
+            <description>Asserts the "X as low as Y" message on PLP</description>
+        </annotations>
+        <arguments>
+            <argument name="X" type="string"/>
+            <argument name="Y" type="string"/>
+        </arguments>
+       
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal(X)}}" stepKey="assertZ"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertTextLabel"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', Y)}}" stepKey="assertY"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml
new file mode 100644
index 0000000000000..2ccab64b18bef
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertXRegularPriceYMessageOnPLPActionGroup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertXRegularPriceYMessageOnPLPActionGroup">
+        <annotations>
+            <description>Asserts the "X Regular Price Y" message on PLP</description>
+        </annotations>
+        <arguments>
+            <argument name="X" type="string"/>
+            <argument name="Y" type="string"/>
+        </arguments>
+       
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal(X)}}" stepKey="assertX"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld(Y)}}" stepKey="assertY"/>
+        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertTextLabel"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index 0d5d78918ec21..99634e3b6d483 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -5,8 +5,8 @@
   * See COPYING.txt for license details.
   */
 -->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminApplyTierPriceToProductTest">
         <annotations>
             <features value="Catalog"/>
@@ -31,20 +31,17 @@
             <deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex1"/>
-            <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex1"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="resetGridToDefaultKeywordSearch"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-      
-        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
-            <argument name="product" value="$$createSimpleProduct$$"/>
-        </actionGroup>
-        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
-            <argument name="product" value="$$createSimpleProduct$$"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="searchForSimpleProduct"/>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openEditProduct1">
+            <argument name="productId" value="$$createSimpleProduct.id$$"/>
         </actionGroup>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
-       
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage1"/>
+
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCustomerGroupPriceAddButton1"/>
         <actionGroup ref="AdminProductFormAdvancedPricingAddTierPriceActionGroup" stepKey="addCustomerGroupAllGroupsQty1PriceDiscountAnd10percent">
@@ -52,7 +49,7 @@
             <argument name="quantity" value="1"/>
             <argument name="priceType" value="Discount"/>
             <argument name="amount" value="10"/>
-        </actionGroup> 
+        </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductTierPriceQtyInput1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProductTierPriceValueType1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProductTierPricePriceInput"/>
@@ -66,25 +63,30 @@
             <argument name="category" value="$createCategory$"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad1"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_1"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_1"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_1"/>
+        <actionGroup ref="StorefrontAssertXRegularPriceYMessageOnPLPActionGroup" stepKey="assertProductFinalPriceIs90_1">
+            <argument name="X" value="90"/>
+            <argument name="Y" value="100"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertRegularPriceLabel_1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertRegularPriceAmount_1"/>
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad2"/>
 
         <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage2">
             <argument name="category" value="$createCategory$"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad3"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_2"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_2"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_2"/>
-
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
-        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
-            <argument name="product" value="$$createSimpleProduct$$"/>
+        <actionGroup ref="StorefrontAssertXRegularPriceYMessageOnPLPActionGroup" stepKey="assertProductFinalPriceIs90_2">
+            <argument name="X" value="90"/>
+            <argument name="Y" value="100"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertRegularPriceLabel_2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertRegularPriceAmount_2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex2"/>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openEditProduct2">
+            <argument name="productId" value="$$createSimpleProduct.id$$"/>
         </actionGroup>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage2"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSelectCustomerGroupNameAttribute1"/>
@@ -93,7 +95,7 @@
             <argument name="quantity" value="1"/>
             <argument name="priceType" value="Discount"/>
             <argument name="amount" value="10"/>
-        </actionGroup> 
+        </actionGroup>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton2"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct2"/>
 
@@ -101,7 +103,9 @@
             <argument name="category" value="$createCategory$"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad4"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_1"/>
+        <actionGroup ref="StorefrontAssertPriceOnPLPActionGroup" stepKey="assertProductFinalPriceIs100_1">
+            <argument name="price" value="100"/>
+        </actionGroup>
         <dontSeeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_3"/>
 
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin2">
@@ -111,15 +115,17 @@
             <argument name="category" value="$createCategory$"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad5"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('90')}}" stepKey="assertProductFinalPriceIs90_3"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_4"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_3"/>
-
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex3"/>
-        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
-            <argument name="product" value="$$createSimpleProduct$$"/>
+        <actionGroup ref="StorefrontAssertXRegularPriceYMessageOnPLPActionGroup" stepKey="assertProductFinalPriceIs90_3">
+            <argument name="X" value="90"/>
+            <argument name="Y" value="100"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertRegularPriceLabel_4"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertRegularPriceAmount_3"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex3"/>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openEditProduct3">
+            <argument name="productId" value="$$createSimpleProduct.id$$"/>
         </actionGroup>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage3"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage3"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton3"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton3"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSelectCustomerGroupNameAttribute2"/>
@@ -128,7 +134,7 @@
             <argument name="quantity" value="15"/>
             <argument name="priceType" value="Discount"/>
             <argument name="amount" value="10"/>
-        </actionGroup> 
+        </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductTierPriceQtyInput15"/>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickToLoseFocusOnRequiredInputElement"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton3_1"/>
@@ -137,10 +143,10 @@
             <argument name="quantity" value="20"/>
             <argument name="priceType" value="Discount"/>
             <argument name="amount" value="18"/>
-        </actionGroup> 
-        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="fillProductTierPriceQtyInput20"/>
-        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="selectProductTierPriceValueType2"/>
-        <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="selectProductTierPricePriceInput18"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductTierPriceQtyInput20"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProductTierPriceValueType2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectProductTierPricePriceInput18"/>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton3"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct3"/>
 
@@ -148,53 +154,69 @@
             <argument name="category" value="$createCategory$"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad6"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_2"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_1"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_1"/>
+        <actionGroup ref="StorefrontAssertXAsLowAsYMessageOnPLPActionGroup" stepKey="assertProductFinalPriceIs100_2">
+            <argument name="X" value="100"/>
+            <argument name="Y" value="82"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertAsLowAsPriceLabel_1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertPriceAfterAsLowAsLabel_1"/>
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer2"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad7"/>
 
         <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage6">
             <argument name="category" value="$createCategory$"/>
         </actionGroup>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad8"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceFinal('100')}}" stepKey="assertProductFinalPriceIs100_3"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('As low as')}}" stepKey="assertAsLowAsPriceLabel_2"/>
-        <seeElement selector="{{StorefrontCategoryProductSection.productPriceLinkAfterLabel('As low as', '82')}}" stepKey="assertPriceAfterAsLowAsLabel_2"/>
+        <actionGroup ref="StorefrontAssertXAsLowAsYMessageOnPLPActionGroup" stepKey="assertProductFinalPriceIs100_3">
+            <argument name="X" value="100"/>
+            <argument name="Y" value="82"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertAsLowAsPriceLabel_2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertPriceAfterAsLowAsLabel_2"/>
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage1">
-            <argument name="productUrl" value="$$createSimpleProduct.name$$"/>
-        </actionGroup>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow1"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow1"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('1', '90')}}" stepKey="assertProductTierPriceAmountForFirstRow1"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '82')}}" stepKey="assertProductTierPriceAmountForSecondRow1"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow1"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '18')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow1"/>
+            <argument name="productUrl" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad9"/>
+        <actionGroup ref="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup" stepKey="assertProductTierPriceByForTextLabelForFirstRow1">
+            <argument name="priceIndex" value="1"/>
+            <argument name="X" value="15"/>
+            <argument name="Y" value="90"/>
+            <argument name="Z" value="10"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup" stepKey="assertProductTierPriceByForTextLabelForSecondRow1">
+            <argument name="priceIndex" value="2"/>
+            <argument name="X" value="20"/>
+            <argument name="Y" value="82"/>
+            <argument name="Z" value="18"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceAmountForFirstRow1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceAmountForSecondRow1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillProductQuantity1"/>
 
         <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="addToCartFromStorefrontProductPage">
             <argument name="quantity" value="10"/>
         </actionGroup>
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-        <seeInField userInput="10" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField10"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField1"/>
-        <assertEquals message="Shopping cart should contain subtotal $1,000" stepKey="assertSubtotalField1">
-            <expectedResult type="string">$1,000.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField1</actualResult>
-        </assertEquals>
-       
+        <actionGroup ref="StorefrontAssertProductQtyInCartActionGroup" stepKey="seeInQtyField10">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productQuantity" value="10"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField1"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField1">
+            <argument name="expectedSubtotal" value="$1,000.00"/>
+        </actionGroup>
         <actionGroup ref="StorefrontChangeProductQtyInTheCartActionGroup" stepKey="fillProductQuantity2">
             <argument name="productName" value="$$createSimpleProduct.name$$"/>
             <argument name="qty" value="15"/>
         </actionGroup>
         <actionGroup ref="AdminUpdateShoppingCartActionGroup" stepKey="clickUpdateShoppingCartButton1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoadingMaskToDisappear1"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField2"/>
-        <assertEquals message="Shopping cart should contain subtotal $1,350" stepKey="assertSubtotalField2">
-            <expectedResult type="string">$1,350.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField2</actualResult>
-        </assertEquals>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField2"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField2">
+            <argument name="expectedSubtotal" value="$1,350.00"/>
+        </actionGroup>
 
         <actionGroup ref="StorefrontChangeProductQtyInTheCartActionGroup" stepKey="fillProductQuantity3">
             <argument name="productName" value="$$createSimpleProduct.name$$"/>
@@ -202,17 +224,15 @@
         </actionGroup>
         <actionGroup ref="AdminUpdateShoppingCartActionGroup" stepKey="clickUpdateShoppingCartButton2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoadingMaskToDisappear2"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField3"/>
-        <assertEquals message="Shopping cart should contain subtotal $1,640" stepKey="assertSubtotalField3">
-            <expectedResult type="string">$1,640.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField3</actualResult>
-        </assertEquals>
-       
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex4"/>
-        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
-            <argument name="product" value="$$createSimpleProduct$$"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField3"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField3">
+            <argument name="expectedSubtotal" value="$1,640.00"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex4"/>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openEditProduct4">
+            <argument name="productId" value="$$createSimpleProduct.id$$"/>
         </actionGroup>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage4"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage4"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton4"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton4"/>
         <actionGroup ref="AdminProductFormAdvancedPricingUpdateTierPriceActionGroup" stepKey="selectProductTierPricePercentageValue2">
@@ -220,30 +240,30 @@
             <argument name="quantity" value="20"/>
             <argument name="priceType" value="Discount"/>
             <argument name="amount" value="25"/>
-        </actionGroup>   
+        </actionGroup>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton4"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct4"/>
 
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage1"/>
-        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField4"/>
-        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField4">
-            <expectedResult type="string">$1,500.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField4</actualResult>
-        </assertEquals>
-        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal1"/>
-        <assertEquals message="Shopping cart summary section should contain subtotal $1,500" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection1">
-            <expectedResult type="string">$1,500.00</expectedResult>
-            <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal1</actualResult>
-        </assertEquals>
+        <actionGroup ref="StorefrontAssertProductQtyInCartActionGroup" stepKey="seeInQtyField20">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productQuantity" value="20"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField4"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField4">
+            <argument name="expectedSubtotal" value="$1,500.00"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal1"/>
+        <actionGroup ref="StorefrontAssertCartSubtotalActionGroup" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection1">
+            <argument name="expectedSubtotal" value="$1,500.00"/>
+        </actionGroup>
 
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForminiCartSubtotalField1"/>
-        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField"/>
-        <assertEquals message="Mini shopping cart should contain subtotal $1,500" stepKey="assertSubtotalFieldFromMiniShoppingCart1">
-            <expectedResult type="string">$1,500.00</expectedResult>
-            <actualResult type="variable">grabTextFromMiniCartSubtotalField</actualResult>
-        </assertEquals>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromMiniCartSubtotalField"/>
+        <actionGroup ref="StorefrontAssertMiniCartSubtotalActionGroup" stepKey="assertSubtotalFieldFromMiniShoppingCart1">
+            <argument name="expectedSubtotal" value="$1,500.00"/>
+        </actionGroup>
 
         <actionGroup ref="AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup" stepKey="navigateToAdminSalesConfigPageMAPTab1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminSalesConfigPageLoad1"/>
@@ -254,45 +274,58 @@
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
 
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage2"/>
-        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_2"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField5"/>
-        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField5">
-            <expectedResult type="string">$1,500.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField5</actualResult>
-        </assertEquals>
+        <actionGroup ref="StorefrontAssertProductQtyInCartActionGroup" stepKey="seeInQtyField20_2">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productQuantity" value="20"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField5"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField5">
+            <argument name="expectedSubtotal" value="$1,500.00"/>
+        </actionGroup>
 
         <actionGroup ref="AdminNavigateToStoresConfigurationSalesSalesMSRPActionGroup" stepKey="navigateToAdminSalesConfigPageMAPTab2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminSalesConfigPageLoad2"/>
         <actionGroup ref="AdminEnableDisableMAPActionGroup" stepKey="setEnableMAPNo">
             <argument name="status" value="No"/>
-        </actionGroup>    
+        </actionGroup>
         <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage1"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
 
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage3"/>
-        <seeInField userInput="20" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20_3"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField6"/>
-        <assertEquals message="Shopping cart should contain subtotal $1,500" stepKey="assertSubtotalField6">
-            <expectedResult type="string">$1,500.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField6</actualResult>
-        </assertEquals>
-       
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage2">
-            <argument name="productUrl" value="$$createSimpleProduct.name$$"/>
-        </actionGroup>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', '15')}}" stepKey="assertProductTierPriceByForTextLabelForFirstRow2"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('2', '20')}}" stepKey="assertProductTierPriceByForTextLabelForSecondRow2"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('1', '90')}}" stepKey="assertProductTierPriceAmountForFirstRow2"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '75')}}" stepKey="assertProductTierPriceAmountForSecondRow2"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
-        <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '25')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex5"/>
-        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct5">
+        <actionGroup ref="StorefrontAssertProductQtyInCartActionGroup" stepKey="seeInQtyField20_3">
             <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productQuantity" value="20"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField6"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField6">
+            <argument name="expectedSubtotal" value="$1,500.00"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad10"/>
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage2">
+            <argument name="productUrl" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup" stepKey="assertProductTierPriceByForTextLabelForFirstRow21">
+            <argument name="priceIndex" value="1"/>
+            <argument name="X" value="15"/>
+            <argument name="Y" value="90"/>
+            <argument name="Z" value="10"/>
         </actionGroup>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage5"/>
+        <actionGroup ref="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup" stepKey="assertProductTierPriceByForTextLabelForSecondRow2">
+            <argument name="priceIndex" value="2"/>
+            <argument name="X" value="20"/>
+            <argument name="Y" value="75"/>
+            <argument name="Z" value="25"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceAmountForFirstRow2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceAmountForSecondRow2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex"/>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openEditProduct5">
+            <argument name="productId" value="$$createSimpleProduct.id$$"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage5"/>
 
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton5"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceDeleteButton"/>
@@ -301,9 +334,9 @@
         <actionGroup ref="AdminDeleteTierPriceActionGroup" stepKey="deleteSecondRowOfCustomerGroupPrice"/>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="clickDoneButton5"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct5"/>
-        <scrollToTopOfPage stepKey="scrollToTopOfPage6"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="scrollToTopOfPage6"/>
         <actionGroup ref="AdminProductFormOpenAdvancedPricingDialogActionGroup" stepKey="clickOnAdvancedPricingButton6"/>
-        <waitForElement selector="{{AdminProductFormAdvancedPricingSection.customerGroupPriceAddButton}}" stepKey="waitForcustomerGroupPriceAddButton5"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForcustomerGroupPriceAddButton5"/>
         <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" stepKey="dontSeeQtyInputOfFirstRow"/>
         <dontSeeElement selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('1')}}" stepKey="dontSeeQtyInputOfSecondRow"/>
         <actionGroup ref="AdminProductFormDoneAdvancedPricingDialogActionGroup" stepKey="closeAdvancedPricingPopup"/>
@@ -314,23 +347,20 @@
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
 
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage4"/>
-        <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField7"/>
-        <assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">
-            <expectedResult type="string">$4,000.00</expectedResult>
-            <actualResult type="variable">grabTextFromSubtotalField7</actualResult>
-        </assertEquals>
-        <grabTextFrom selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal2"/>
-        <assertEquals message="Shopping cart summary section should contain subtotal $4,000" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection2">
-            <expectedResult type="string">$4,000.00</expectedResult>
-            <actualResult type="variable">grabTextFromCheckoutCartSummarySectionSubtotal2</actualResult>
-        </assertEquals>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromSubtotalField7"/>
+        <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField7">
+            <argument name="expectedSubtotal" value="$4,000.00"/>
+        </actionGroup>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromCheckoutCartSummarySectionSubtotal2"/>
+        <actionGroup ref="StorefrontAssertCartSubtotalActionGroup" stepKey="assertSubtotalFieldFromCheckoutCartSummarySection2">
+            <argument name="expectedSubtotal" value="$4,000.00"/>
+        </actionGroup>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForminiCartSubtotalField2"/>
 
-        <grabTextFrom selector="{{StorefrontMinicartSection.miniCartSubtotalField}}" stepKey="grabTextFromMiniCartSubtotalField2"/>
-        <assertEquals message="Mini shopping cart should contain subtotal $4,000" stepKey="assertSubtotalFieldFromMiniShoppingCart2">
-            <expectedResult type="string">$4,000.00</expectedResult>
-            <actualResult type="variable">grabTextFromMiniCartSubtotalField2</actualResult>
-        </assertEquals>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="grabTextFromMiniCartSubtotalField2"/>
+        <actionGroup ref="StorefrontAssertMiniCartSubtotalActionGroup" stepKey="assertSubtotalFieldFromMiniShoppingCart2">
+            <argument name="expectedSubtotal" value="$4,000.00"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml
new file mode 100644
index 0000000000000..92e7f329ad7f0
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertProductQtyInCartActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontAssertProductQtyInCartActionGroup">
+        <annotations>
+            <description>Asserts product qty in the Cart</description>
+        </annotations>
+        <arguments>
+            <argument name="product" type="entity"/>
+            <argument name="productQuantity" type="string"/>
+        </arguments>
+
+        <seeInField userInput="{{productQuantity}}" selector="{{CheckoutCartProductSection.ProductQuantityByName(product.name)}}" stepKey="assertProductQuantity"/>
+    </actionGroup>
+</actionGroups>

From 6ce8ea50aa5b5593f64b6b3d4b775d3c212d1c83 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Fri, 10 Sep 2021 23:48:15 +0300
Subject: [PATCH 5/7] fixed stepKeys

---
 .../AdminApplyTierPriceToProductTest.xml                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index 99634e3b6d483..2663587b02f1c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -270,7 +270,7 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="uncheckMAPUseSystemValue"/>
         <actionGroup ref="AdminEnableDisableMAPActionGroup" stepKey="setEnableMAPYes"/>
         <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig1"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage2"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage1"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache1"/>
 
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage2"/>
@@ -289,7 +289,7 @@
             <argument name="status" value="No"/>
         </actionGroup>
         <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig2"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeConfigSuccessMessage2"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="flushCache2"/>
 
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage3"/>

From 9e6578056231dc338572ff2553135fb680dc447d Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Sun, 7 Nov 2021 22:36:54 +0200
Subject: [PATCH 6/7] fixed stepKeys

---
 .../AdminApplyTierPriceToProductTest.xml                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index 2663587b02f1c..58688542cdbbe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -301,11 +301,11 @@
         <actionGroup ref="StorefrontAssertProductSubtotalInTheCartActionGroup" stepKey="assertSubtotalField6">
             <argument name="expectedSubtotal" value="$1,500.00"/>
         </actionGroup>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad10"/>
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToProductPage2">
             <argument name="productUrl" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup" stepKey="assertProductTierPriceByForTextLabelForFirstRow21">
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad10"/>
+        <actionGroup ref="StorefrontAssertBuyXForYEachAndSaveZMessageOnPDPActionGroup" stepKey="assertProductTierPriceByForTextLabelForFirstRow2">
             <argument name="priceIndex" value="1"/>
             <argument name="X" value="15"/>
             <argument name="Y" value="90"/>
@@ -321,7 +321,7 @@
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceAmountForSecondRow2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
-        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="navigateToProductIndex5"/>
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openEditProduct5">
             <argument name="productId" value="$$createSimpleProduct.id$$"/>
         </actionGroup>

From 136e26456b651b421ed4bed1b39bf8c40ca93372 Mon Sep 17 00:00:00 2001
From: Anna Pak <a.pak@atwix.com>
Date: Wed, 5 Jan 2022 15:57:41 +0200
Subject: [PATCH 7/7] added reindex

---
 .../AdminApplyTierPriceToProductTest.xml                         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index 58688542cdbbe..36219ae26df06 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -26,6 +26,7 @@
                 <requiredEntity createDataKey="createCategory"/>
                 <field key="price">100</field>
             </createData>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </before>
         <after>
             <deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>