Merge remote-tracking branch 'origin/MC-31864' into 2.4-develop-pr24

Author: serhii-balko

app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

@@ -39,19 +39,19 @@
             <createData entity="CustomerAccountSharingGlobal" stepKey="setConfigCustomerAccountToGlobal"/>
         </before>
 
-        <!--Create website, Sore adn Store View-->
+        <!--Create website, Store and Store View-->
         <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
-            <argument name="newWebsiteName" value="secondWebsite"/>
-            <argument name="websiteCode" value="second_website"/>
+            <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+            <argument name="websiteCode" value="{{customWebsite.code}}"/>
         </actionGroup>
         <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
-            <argument name="website" value="secondWebsite"/>
-            <argument name="storeGroupName" value="secondStore"/>
-            <argument name="storeGroupCode" value="second_store"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
+            <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+            <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
         </actionGroup>
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
-            <argument name="StoreGroup" value="customStoreTierPrice"/>
-            <argument name="customStore" value="customStoreView"/>
+            <argument name="StoreGroup" value="customStoreGroup"/>
+            <argument name="customStore" value="customStore"/>
         </actionGroup>
         <!--Set Configuration-->
         <createData entity="CatalogPriceScopeWebsite" stepKey="paymentMethodsSettingConfig"/>
@@ -63,10 +63,10 @@
             <argument name="product" value="$$product1$$"/>
         </actionGroup>
         <actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing1">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct2">
@@ -76,10 +76,10 @@
             <argument name="product" value="$$product2$$"/>
         </actionGroup>
         <actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite2">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing2">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct3">
@@ -89,10 +89,10 @@
             <argument name="product" value="$$product3$$"/>
         </actionGroup>
         <actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite3">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing3">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct4">
@@ -102,10 +102,10 @@
             <argument name="product" value="$$product4$$"/>
         </actionGroup>
         <actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite4">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
         <actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="ProductSetAdvancedPricing4">
-            <argument name="website" value="secondWebsite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
         <actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
 
@@ -120,7 +120,7 @@
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="ClickOnAccountInformationSection"/>
         <waitForPageLoad stepKey="waitForPageOpened1"/>
         <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="Group"/>
-        <selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="secondStoreView" stepKey="clickToSelectStore"/>
+        <selectOption selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{customStore.name}}" stepKey="clickToSelectStore"/>
         <click selector="{{AdminCustomerAccountInformationSection.saveCustomer}}" stepKey="save"/>
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see userInput="You saved the customer." stepKey="CustomerIsSaved"/>
@@ -136,7 +136,7 @@
         <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
         <waitForPageLoad stepKey="waitForPageDiscountPageIsLoaded"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="ship" stepKey="fillRuleName"/>
-        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="secondWebsite" stepKey="selectWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="{{customWebsite.name}}" stepKey="selectWebsites"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="Retailer" stepKey="selectCustomerGroup"/>
         <selectOption selector="{{AdminCartPriceRulesFormSection.coupon}}" userInput="Specific Coupon" stepKey="selectCouponType"/>
         <fillField selector="{{AdminCartPriceRulesFormSection.couponCode}}" userInput="ship" stepKey="setCode"/>
@@ -152,7 +152,7 @@
         <!--Create new order-->
         <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="CreateNewOrder">
             <argument name="customer" value="Simple_US_Customer"/>
-            <argument name="storeView" value="customStoreView"/>
+            <argument name="storeView" value="customStore"/>
         </actionGroup>
 
         <click  selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct"/>
@@ -327,7 +327,7 @@
                 <argument name="ruleName" value="ship"/>
             </actionGroup>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
-                <argument name="websiteName" value="secondWebsite"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
             <createData entity="CustomerAccountSharingDefault" stepKey="setConfigCustomerAccountDefault"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>