Merge branch 'AC-4593CE-de' into functional-testing-mainline-deployment

Author: Manjusha

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

@@ -22,6 +22,9 @@
             <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
 
+            <!-- remove the Filter From the page-->
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
+
             <!--Create Category-->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
 

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml

@@ -50,5 +50,6 @@
         <element name="minicartclose" type="button" selector="//button[@id='btn-minicart-close']"/>
         <element name="productCountNew" type="text" selector=".minicart-wrapper .action.showcart .counter-number"/>
         <element name="image" type="text" selector="//*[@class='product-image-container']//img[contains(@src, '{{var1}}')]" parameterized="true"/>
+        <element name="proceedToCheckout" type="button" selector="//button[@data-role='proceed-to-checkout']"/>
     </section>
 </sections>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml

@@ -46,5 +46,6 @@
         <element name="orderId" type="text" selector="//table[contains(@class, 'data-grid')]//div[contains(text(), '{{orderId}}')]" parameterized="true"/>
         <element name="exactOrderId" type="text" selector="//table[contains(@class, 'data-grid')]//div[text()='{{orderId}}']" parameterized="true"/>
         <element name="orderIdByIncrementId" type="text" selector="//input[@class='admin__control-checkbox' and @value={{incrId}}]/parent::label/parent::td/following-sibling::td"  parameterized="true"/>
+        <element name="orderSubtotal" type="input" selector="//tbody//tr[@class='col-0']//td[@class='label' and contains(text(),'Subtotal')]/..//td//span[@class='price']"/>
     </section>
 </sections>

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToGroupedProductWithInvisibleIndividualProductTest.xml

@@ -19,6 +19,8 @@
         </annotations>
         <before>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <createData entity="ApiCategory" stepKey="createCategoryOne"/>
             <createData entity="ApiSimpleProduct" stepKey="createFirstSimpleProduct">
                 <field key ="price">100</field>

app/code/Magento/Store/Test/Mftf/ActionGroup/AdminIsDefaultWebsiteActionGroup.xml

@@ -0,0 +1,30 @@
+<?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="AdminIsDefaultWebsiteActionGroup">
+        <annotations>
+            <description>Goes to the Admin Stores grid page. Select the provided Website Name and select the is default .</description>
+        </annotations>
+        <arguments>
+            <argument name="websiteName" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="resetSearchFilter"/>
+        <fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
+        <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
+        <see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
+        <click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
+        <waitForPageLoad stepKey="waitForStoreToLoad"/>
+        <click selector="{{AdminStoresGridSection.isDefaultUnCheckBox}}" stepKey="clickOnCheckBox"/>
+        <click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite"/>
+        <see userInput="You saved the website." stepKey="seeSavedMessage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection/AdminStoresGridSection.xml

@@ -24,5 +24,6 @@
         <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
         <element name="gridCell" type="text" selector="//table[@class='data-grid']//tr[{{row}}]//td[count(//table[@class='data-grid']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
         <element name="storeViewLinkInNthRow" type="text" selector="tr:nth-of-type({{row}}) &gt; .col-store_title &gt; a" parameterized="true"/>
-     </section>
+        <element name="isDefaultUnCheckBox" type="checkbox" selector="//input[@id='is_default']"/>
+    </section>
 </sections>