MQE-727: MSI Test Cases

- Reverting Robo changes.
- Removing the "AdminClearGridFiltersActionGroup".
- Replacing AdminClearGridFiltersActionGroup logic with a conditionalClick for the "Clear All" button.
- Revised selectors in the Admin Grid section.

Author: ivy00johns

dev/tests/acceptance/RoboFile.php

@@ -89,7 +89,7 @@ function functional()
      */
     function group($args = '')
     {
-        $this->taskExec('.' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'codecept run functional --debug --skip-group skip --group')->args($args)->run();
+        $this->taskExec('.' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . 'codecept run functional --verbose --steps --skip-group skip --group')->args($args)->run();
     }
 
     /**

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminClearGridFiltersActionGroup.xml

@@ -14,11 +14,8 @@
             <argument name="value"/>
         </arguments>
 
-        <!-- Start of Action Group: AdminClearGridFiltersIfPresent -->
-        <conditionalClick selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-remove" dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show" visible="true" stepKey="clearTheFiltersIfPresent"/>
-        <executeJS function="jQuery('.action-remove').click();" stepKey="clearIfMultipleExist"/>
+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show" visible="true" stepKey="clearTheFiltersIfPresent"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="5"/>
-        <!-- End of Action Group: AdminClearGridFiltersIfPresent -->
 
         <click selector="{{AdminGridFilterControls.filters}}" stepKey="clickOnFilters1"/>
         <fillField userInput="{{value}}" selector="{{selector}}" stepKey="fillCodeField2"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml

@@ -13,11 +13,8 @@
             <argument name="value"/>
         </arguments>
 
-        <!-- Start of Action Group: AdminClearGridFiltersIfPresent -->
-        <conditionalClick selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-remove" dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show" visible="true" stepKey="clearTheFiltersIfPresent"/>
-        <executeJS function="jQuery('.action-remove').click();" stepKey="clearIfMultipleExist"/>
+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show" visible="true" stepKey="clearTheFiltersIfPresent"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="5"/>
-        <!-- End of Action Group: AdminClearGridFiltersIfPresent -->
 
         <fillField selector="{{AdminGridSearchBox.searchByKeyword}}" userInput="{{value}}" stepKey="fillSearchByKeyword"/>
         <click selector="{{AdminGridSearchBox.search}}" stepKey="clickOnSearch"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridSearchByKeywordActionGroup.xml

@@ -30,6 +30,7 @@
         <element name="filters" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-expand']" timeout="5"/>
         <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
         <element name="cancel" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-reset']" timeout="5"/>
     </section>
     <!-- TODO: "Default View" drop down menu -->
     <section name="AdminGridColumnsControls">
@@ -54,9 +55,9 @@
         <element name="rowOne" type="text" selector="tr[data-repeat-index='0']"/>
         <element name="rowByIndex" type="text" selector="tr[data-repeat-index='{{var1}}']" parameterized="true"/>
 
-        <element name="editByValue" type="button" selector="//div[@class='data-grid-cell-content'][contains(text(), '{{var1}}')]/parent::*/parent::*/*/a" parameterized="true"/>
+        <element name="editByValue" type="button" selector="//a[ancestor::tr[contains(., '{{var1}}')]]" parameterized="true"/>
 
-        <element name="checkboxByValue" type="checkbox" selector="//div[@class='data-grid-cell-content'][contains(text(), '{{var1}}')]/parent::*/parent::*/*/*/input" parameterized="true"/>
+        <element name="checkboxByValue" type="checkbox" selector="//input[ancestor::tr[contains(., '{{var1}}')]]" parameterized="true"/>
         <element name="checkboxByIndex" type="checkbox" selector=".data-row[data-repeat-index='{{var1}}'] .admin__control-checkbox" parameterized="true"/>
     </section>
 </sections>