MC-214: Admin should be able to filter product list by type = Bundle Product

Clendenin · Clendenin · commit ee16a2e6db36 · 2018-06-25T13:59:33.000-05:00
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminClearFiltersActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/AdminClearFiltersActionGroup.xml
@@ -11,6 +11,6 @@
     <actionGroup name="AdminClearFiltersActionGroup">
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
-        <conditionalClick selector="{{AdminProductCatalog.filtersClear}}" dependentSelector="{{AdminProductCatalog.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
     </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/BundleProductFilterActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/BundleProductFilterActionGroup.xml
@@ -11,9 +11,9 @@
     <actionGroup name="BundleProductFilter">
         <!--Setting filter-->
         <!--Prereq: go to admin product catalog page-->
-        <click selector="{{AdminProductCatalog.filter}}" stepKey="ClickOnFilter"/>
-        <click selector="{{AdminProductCatalog.typeDropDown}}" stepKey="ClickOnTypeDropDown"/>
-        <click selector="{{AdminProductCatalog.bundleOption}}" stepKey="ClickOnBundleOption"/>
-        <click selector="{{AdminProductCatalog.applyFilters}}" stepKey="ClickOnApplyFilters"/>
+        <click selector="{{AdminProductFiltersSection.filter}}" stepKey="ClickOnFilter"/>
+        <click selector="{{AdminProductFiltersSection.typeDropDown}}" stepKey="ClickOnTypeDropDown"/>
+        <click selector="{{AdminProductFiltersSection.bundleOption}}" stepKey="ClickOnBundleOption"/>
+        <click selector="{{AdminProductFiltersSection.applyFilters}}" stepKey="ClickOnApplyFilters"/>
     </actionGroup>
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/ActionGroup/EnableDisableProductActionGroup.xml
@@ -25,7 +25,7 @@
     <actionGroup name="FindProductToEdit">
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToProductCatalog"/>
         <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
-        <conditionalClick selector="{{AdminProductCatalog.filtersClear}}" dependentSelector="{{AdminProductCatalog.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
         <waitForPageLoad stepKey="RemovingFilters"/>
         <fillField userInput="{{BundleProduct.name}}" selector="#fulltext" stepKey="EnterProductNameInSearch"/>
         <click stepKey="ClickSearch" selector="{{AdminProductFormBundleSection.searchButton}}"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductCatalogSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Section/AdminProductCatalogSection.xml
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddBundleItemsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAddBundleItemsTest.xml
@@ -89,7 +89,7 @@
         <!--Go to bundle product creation page-->
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
-        <conditionalClick selector="{{AdminProductCatalog.filtersClear}}" dependentSelector="{{AdminProductCatalog.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
         <waitForPageLoad stepKey="WaitForClear"/>
         <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAttributeSetSelectionTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminAttributeSetSelectionTest.xml
@@ -59,10 +59,10 @@
         <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
-        <seeElement selector="{{AdminProductCatalog.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeSet"/>
+        <seeElement selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeSet"/>
 
         <!--Editing Attribute set-->
-        <click selector="{{AdminProductCatalog.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="clickAttributeSet2"/>
+        <click selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(ProductAttributeFrontendLabel.label)}}" stepKey="clickAttributeSet2"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
 
         <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet2"/>
@@ -80,6 +80,6 @@
         <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName2">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
-        <seeElement selector="{{AdminProductCatalog.attributeSetOfFirstRow(BundleProduct.defaultAttribute)}}" stepKey="seeAttributeSet2"/>
+        <seeElement selector="{{AdminProductFiltersSection.attributeSetOfFirstRow(BundleProduct.defaultAttribute)}}" stepKey="seeAttributeSet2"/>
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminDeleteABundleProduct.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminDeleteABundleProduct.xml
@@ -67,17 +67,17 @@
         <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductCatalog.allCheckbox}}" stepKey="SelectAllOnly1"/>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="SelectAllOnly1"/>
         <waitForPageLoad stepKey="loading2"/>
 
         <!--Delete-->
-        <click selector="{{AdminProductCatalog.actions}}" stepKey="ClickOnActionsChangingView"/>
-        <click selector="{{AdminProductCatalog.delete}}" stepKey="ClickDelete"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
         <click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
         <waitForPageLoad stepKey="loading3"/>
 
         <!--Locating delete message-->
-        <seeElement selector="{{AdminProductCatalog.deleteMessage}}" stepKey="deleteMessage"/>
+        <seeElement selector="{{AdminProductFiltersSection.deleteMessage}}" stepKey="deleteMessage"/>
 
         <!--Testing deletion of product-->
         <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminFilterProductListByBundleProduct.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminFilterProductListByBundleProduct.xml
@@ -67,7 +67,7 @@
         <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
 
         <!--Testing application of filter-->
-        <see selector="{{AdminProductCatalog.productType('0')}}" userInput="Bundle Product" stepKey="correcType0"/>
-        <dontSeeElement selector="{{AdminProductCatalog.AllProductsNotOfBundleType}}" stepKey="checkingRowsForIncorrectType"/>
+        <see selector="{{AdminProductFiltersSection.productType('0')}}" userInput="Bundle Product" stepKey="correcType0"/>
+        <dontSeeElement selector="{{AdminProductFiltersSection.AllProductsNotOfBundleType}}" stepKey="checkingRowsForIncorrectType"/>
     </test>
 </tests>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminMassDeleteBundleProducts.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/AdminMassDeleteBundleProducts.xml
@@ -117,15 +117,15 @@
         <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
 
         <!--Delete-->
-        <click selector="{{AdminProductCatalog.allCheckbox}}" stepKey="SelectAllOnly1"/>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="SelectAllOnly1"/>
         <waitForPageLoad stepKey="loading"/>
-        <click selector="{{AdminProductCatalog.actions}}" stepKey="ClickOnActionsChangingView"/>
-        <click selector="{{AdminProductCatalog.delete}}" stepKey="ClickDelete"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
         <click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
         <waitForPageLoad stepKey="loading3"/>
 
         <!--Locating delete message-->
-        <seeElement selector="{{AdminProductCatalog.deleteMessage}}" stepKey="deleteMessage"/>
+        <seeElement selector="{{AdminProductFiltersSection.deleteMessage}}" stepKey="deleteMessage"/>
 
         <!--Clear Cache - resets products according to enabled/disabled view-->
         <actionGroup ref="ClearPageCacheActionGroup" stepKey="ClearPageCaches"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/BundleProductFixedPricingTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/BundleProductFixedPricingTest.xml
@@ -76,12 +76,12 @@
         <!--Set filter to product name-->
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
-        <conditionalClick selector="{{AdminProductCatalog.filtersClear}}" dependentSelector="{{AdminProductCatalog.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
+        <conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
         <waitForPageLoad stepKey="WaitForClear"/>
         <actionGroup ref="filterProductGridByName" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
-        <seeElement selector="{{AdminProductCatalog.priceOfFirstRow(BundleProduct.fixedPrice)}}" stepKey="seePrice"/>
+        <seeElement selector="{{AdminProductFiltersSection.priceOfFirstRow(BundleProduct.fixedPrice)}}" stepKey="seePrice"/>
         <!--Storefront-->
         <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageToLoad"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/MassEnableDisableBundleProductsTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Bundle/Test/MassEnableDisableBundleProductsTest.xml
@@ -123,10 +123,10 @@
         <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
 
         <!--Disabling bundle products-->
-        <click selector="{{AdminProductCatalog.allCheckbox}}" stepKey="ClickOnSelectAllCheckBox"/>
-        <click selector="{{AdminProductCatalog.actions}}" stepKey="ClickOnActions"/>
-        <click selector="{{AdminProductCatalog.changeStatus}}" stepKey="ClickOnChangeStatus"/>
-        <click selector="{{AdminProductCatalog.disable}}" stepKey="ClickOnDisable"/>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBox"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActions"/>
+        <click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatus"/>
+        <click selector="{{AdminProductFiltersSection.disable}}" stepKey="ClickOnDisable"/>
         <waitForPageLoad stepKey="waitForPageloadToExecute"/>
 
         <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
@@ -142,10 +142,10 @@
         <!--Enabling bundle products-->
         <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
         <waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
-        <click selector="{{AdminProductCatalog.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
-        <click selector="{{AdminProductCatalog.actions}}" stepKey="ClickOnActionsChangingView"/>
-        <click selector="{{AdminProductCatalog.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>
-        <click selector="{{AdminProductCatalog.enable}}" stepKey="ClickOnEnable"/>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>
+        <click selector="{{AdminProductFiltersSection.enable}}" stepKey="ClickOnEnable"/>
 
         <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
         <magentoCLI command="indexer:reindex" stepKey="reindex2"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFiltersSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFiltersSection.xml
@@ -13,5 +13,21 @@
         <element name="nameInput" type="input" selector="input[name=name]"/>
         <element name="skuInput" type="input" selector="input[name=sku]"/>
         <element name="apply" type="button" selector="button[data-action=grid-filter-apply]" timeout="30"/>
+        <element name="filter" type="button" selector="//div[@class='data-grid-filters-action-wrap']/button" timeout="30"/>
+        <element name="typeDropDown" type="multiselect"  selector="//select[@name='type_id']" timeout="30"/>
+        <element name="bundleOption" type="multiselect" selector="//select[@name='type_id']/option[4]" timeout="30"/>
+        <element name="applyFilters" type="button" selector="//button[@class='action-secondary']" timeout="30"/>
+        <element name="allCheckbox" type="checkbox" selector="//div[@data-role='grid-wrapper']//label[@data-bind='attr: {for: ko.uid}']" timeout="30"/>
+        <element name="actions" type="button" selector="//div[@class='action-select-wrap']/button" timeout="30"/>
+        <element name="changeStatus" type="multiselect" selector="//div[@class='action-menu-items']//li[2]" timeout="30"/>
+        <element name="delete" type="multiselect" selector="//div[@class='action-menu-items']//li[1]" timeout="30"/>
+        <element name="disable" type="multiselect" selector="//div[@class='action-menu-items']//ul[@class='action-submenu _active']//li[span='Disable']" timeout="30"/>
+        <element name="enable" type="multiselect" selector="//div[@class='action-menu-items']//ul[@class='action-submenu _active']//li[span='Enable']" timeout="30"/>
+        <element name="filtersClear" type="button" selector="//div[@class='admin__data-grid-header']//button[@data-action='grid-filter-reset']" timeout="30"/>
+        <element name="productType" type="text" selector="//tr[@data-repeat-index='{{var1}}']//td[5]//div[@class='data-grid-cell-content']" parameterized="true"/>
+        <element name="priceOfFirstRow" type="text" selector="//tr[@data-repeat-index='0']//div[contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="AllProductsNotOfBundleType" type="text" selector="//td[5]/div[text() != 'Bundle Product']"/>
+        <element name="attributeSetOfFirstRow" type="text" selector="//tr[@data-repeat-index='0']//div[contains(., '{{var1}}')]" parameterized="true"/>
+        <element name="deleteMessage" type="text" selector="//div[contains(text(), 'record(s) have been deleted.')]"/>
     </section>
 </sections>
