MAGETWO-93830: Automate with MFTF Sort products grid after removing shared catalog

Author: dmitriyprime

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml

@@ -10,17 +10,17 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateApiConfigurableProductActionGroup">
         <!-- Create the configurable product based on the data in the /data folder -->
-            <createData entity="ApiConfigurableProductWithOutCategory" stepKey="createConfigProduct"/>
+        <createData entity="ApiConfigurableProductWithOutCategory" stepKey="createConfigProduct"/>
 
-        <!-- Make the configurable product have two options, that are children of the default attribute set -->
+        <!-- Create attribute with 2 options to be used in children products -->
         <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
         <createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
             <requiredEntity createDataKey="createConfigProductAttribute"/>
         </createData>
         <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
             <requiredEntity createDataKey="createConfigProductAttribute"/>
         </createData>
-        <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+        <createData entity="AddToDefaultSet" stepKey="addAttributeToAttributeSet">
             <requiredEntity createDataKey="createConfigProductAttribute"/>
         </createData>
         <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerGroupResetFilterActionGroup.xml

@@ -0,0 +1,20 @@
+<?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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCustomerGroupActionGroup">
+        <arguments>
+            <argument name="customerGroupName" type="string"/>
+        </arguments>
+        <click selector="{{AdminCustomerGroupGridActionsSection.selectButton('customerGroupName')}}" stepKey="clickSelectButton"/>
+        <click selector="{{AdminCustomerGroupGridActionsSection.deleteAction('customerGroupName')}}" stepKey="clickOnDeleteItem"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDeleteCustomerGroup"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerGroupActionGroup.xml

@@ -12,9 +12,9 @@
         <arguments>
             <argument name="customerGroupName" type="string"/>
         </arguments>
-        <click selector="{{AdminCustomerGroupFiltersSection.filterButton}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
-        <conditionalClick selector="{{AdminCustomerGroupFiltersSection.clearFiltersButton}}" dependentSelector="{{AdminCustomerGroupFiltersSection.clearFiltersButton}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
-        <fillField userInput="{{customerGroupName}}" selector="{{AdminCustomerGroupFiltersSection.nameField}}" stepKey="fillNameFieldOnFiltersSection"/>
-        <click selector="{{AdminCustomerGroupFiltersSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomerGroupIndexPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="cleanFiltersIfTheySet"/>
+        <fillField userInput="{{customerGroupName}}" selector="{{AdminDataGridHeaderSection.filterFieldInput('customer_group_code')}}" stepKey="fillNameFieldOnFiltersSection"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminFilterCustomerGroupByNameActionGroup.xml

@@ -9,7 +9,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGroupGridActionsSection">
-        <element name="selectButton" type="button" selector="table.data-grid button.action-select" timeout="30"/>
-        <element name="selectButtonItem" type="text" selector="//ul[@class='action-menu _active']//a[contains(text(), '{{selectItem}}')]" timeout="30" parameterized="true"/>
+        <element name="selectButton" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" timeout="30" parameterized="true"/>
+        <element name="deleteAction" type="button" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Delete']" timeout="30" parameterized="true"/>
+        <element name="actionsMenuButton" type="text" selector="//div[text()='{{groupName}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='{{selectItem}}']" timeout="30" parameterized="true"/>
     </section>
 </sections>