Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-mftf-pr11

Author: zakdma

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

@@ -108,6 +108,10 @@
         </actionGroup>
         <actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
 
+        <!--Flush cache-->
+        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+
+
         <!--Edit customer info-->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
             <argument name="customer" value="$$customer$$"/>
@@ -318,13 +322,17 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <createData entity="DefaultConfigCatalogPrice" stepKey="defaultConfigCatalogPrice"/>
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
-                <argument name="websiteName" value="secondWebsite"/>
-            </actionGroup>
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
                 <argument name="ruleName" value="ship"/>
             </actionGroup>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="secondWebsite"/>
+            </actionGroup>
             <actionGroup ref="logout" stepKey="logout"/>
+
+            <!--Do reindex and flush cache-->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </after>
     </test>
 </tests>

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCreateCartPriceRuleActionGroup.xml

@@ -48,4 +48,15 @@
         <click selector="{{AdminCartPriceRulesFormSection.delete}}" stepKey="clickDeleteButton"/>
         <click selector="{{AdminCartPriceRulesFormSection.modalAcceptButton}}" stepKey="confirmDelete"/>
     </actionGroup>
+
+    <actionGroup name="CreateCartPriceRuleSecondWebsiteActionGroup">
+        <arguments>
+            <argument name="ruleName"/>
+        </arguments>
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForPriceList"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{ruleName.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Second Website" stepKey="selectWebsites"/>
+    </actionGroup>
 </actionGroups>

app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesSection.xml

@@ -15,5 +15,8 @@
         <element name="nameColumns" type="text" selector="td[data-column='name']"/>
         <element name="rowContainingText" type="text" selector="//*[@id='promo_quote_grid_table']/tbody/tr[td//text()[contains(., '{{var1}}')]]" parameterized="true" timeout="30"/>
         <element name="rowByIndex" type="text" selector="tr[data-role='row']:nth-of-type({{var1}})" parameterized="true" timeout="30"/>
+        <element name="rulesRow" type="text" selector="//tr[@data-role='row']"/>
+        <element name="pageCurrent" type="text" selector="//label[@for='promo_quote_grid_page-current']"/>
+        <element name="totalCount" type="text" selector="span[data-ui-id*='grid-total-count']"/>
     </section>
 </sections>