Skip to content

Commit 676c9bf

Browse files
zakdmazakdma
committed
MAGETWO-96371: Category tree display wrong number of product
1 parent 8f6eeb8 commit 676c9bf

File tree

4 files changed

+34
-25
lines changed

4 files changed

+34
-25
lines changed

‎app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,7 @@ public function loadProductCount($items, $countRegular = true, $countAnchor = tr
323323
'main_table.category_id=e.entity_id',
324324
[]
325325
)->where(
326-
'e.entity_id = :entity_id'
327-
)->orWhere(
328-
'e.path LIKE :c_path'
326+
'(e.entity_id = :entity_id OR e.path LIKE :c_path)'
329327
);
330328
if ($websiteId) {
331329
$select->join(

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminFilteringCategoryProductsUsingScopeSelectorTest.xml

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@
5050
</createData>
5151

5252
<!-- Set filter to product name and product0 not assigned to any website-->
53-
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
54-
<argument name="product" value="_defaultProduct"/>
53+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct0">
54+
<argument name="product" value="$$createProduct0$$"/>
55+
</actionGroup>
56+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit0">
57+
<argument name="product" value="$$createProduct0$$"/>
5558
</actionGroup>
56-
57-
<click selector="{{AdminProductGridSection.productGridNameProduct('$$createProduct0.name$$')}}"
58-
stepKey="clickOpenProductForEdit"/>
59-
<waitForPageLoad time="30" stepKey="waitForProductEditOpen"/>
60-
6159
<scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsitesSection"/>
6260
<click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenWebsiteSection"/>
6361
<waitForPageLoad stepKey="waitForToOpenedWebsiteSection"/>
@@ -67,12 +65,12 @@
6765
stepKey="seeSuccessMessage"/>
6866

6967
<!-- Set filter to product name and product2 in website 2 only -->
70-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
71-
<waitForPageLoad time="30" stepKey="waitForProductsPageToLoad"/>
72-
<click selector="{{AdminProductGridSection.productGridNameProduct('$$createProduct2.name$$')}}"
73-
stepKey="clickOpenProductForEdit1"/>
74-
<waitForPageLoad time="30" stepKey="waitForProductEditOpen1"/>
75-
68+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
69+
<argument name="product" value="$$createProduct2$$"/>
70+
</actionGroup>
71+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit2">
72+
<argument name="product" value="$$createProduct2$$"/>
73+
</actionGroup>
7674
<actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites">
7775
<argument name="website" value="secondWebsite"/>
7876
</actionGroup>
@@ -82,12 +80,12 @@
8280
stepKey="seeSuccessMessage1"/>
8381

8482
<!-- Set filter to product name and product12 assigned to both websites 1 and 2 -->
85-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
86-
<waitForPageLoad time="30" stepKey="waitForProductsPageToLoad1"/>
87-
<click selector="{{AdminProductGridSection.productGridNameProduct('$$createProduct12.name$$')}}"
88-
stepKey="clickOpenProductForEdit2"/>
89-
<waitForPageLoad time="30" stepKey="waitForProductEditOpen2"/>
90-
83+
<actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct12">
84+
<argument name="product" value="$$createProduct12$$"/>
85+
</actionGroup>
86+
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickOpenProductForEdit12">
87+
<argument name="product" value="$$createProduct12$$"/>
88+
</actionGroup>
9189
<actionGroup ref="SelectProductInWebsitesActionGroup" stepKey="selectProductInWebsites1">
9290
<argument name="website" value="secondWebsite"/>
9391
</actionGroup>
@@ -113,6 +111,10 @@
113111
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
114112
stepKey="clickCategoryName"/>
115113
<click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection"/>
114+
<grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
115+
stepKey="grabTextFromCategory"/>
116+
<assertRegExp expected="/\(4\)$/" expectedType="string" actual="$grabTextFromCategory" actualType="variable"
117+
message="wrongCountProductOnAllStoreViews" stepKey="checkCountProducts"/>
116118
<see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct0.name$$)}}"
117119
userInput="$$createProduct0.name$$" stepKey="seeProductName"/>
118120
<see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
@@ -135,6 +137,10 @@
135137
<waitForElementNotVisible selector="{{AdminCategoryMainActionsSection.CategoryStoreViewModalAccept}}"
136138
stepKey="waitForNotVisibleModalAccept"/>
137139
<waitForPageLoad stepKey="waitForCategoryPageLoad2"/>
140+
<grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
141+
stepKey="grabTextFromCategory1"/>
142+
<assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory1" actualType="variable"
143+
message="wrongCountProductOnWebsite1" stepKey="checkCountProducts1"/>
138144
<click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection1"/>
139145
<see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct1.name$$)}}"
140146
userInput="$$createProduct1.name$$" stepKey="seeProductName4"/>
@@ -145,7 +151,7 @@
145151
<dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
146152
userInput="$$createProduct2.name$$" stepKey="dontSeeProductName1"/>
147153

148-
<!-- Step 4: Set scope selector to Website2 ( StopreView for Website 2) -->
154+
<!-- Step 4: Set scope selector to Website2 ( StoreView for Website 2) -->
149155
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
150156
<click selector="{{AdminCategoryMainActionsSection.CategoryStoreViewDropdownToggle}}"
151157
stepKey="clickStoresList1"/>
@@ -160,6 +166,10 @@
160166
stepKey="waitForNotVisibleModalAccept1"/>
161167
<waitForPageLoad stepKey="waitForCategoryPageLoad4"/>
162168
<click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection2"/>
169+
<grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
170+
stepKey="grabTextFromCategory2"/>
171+
<assertRegExp expected="/\(2\)$/" expectedType="string" actual="$grabTextFromCategory2" actualType="variable"
172+
message="wrongCountProductOnWebsite2" stepKey="checkCountProducts2"/>
163173
<see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct2.name$$)}}"
164174
userInput="$$createProduct2.name$$" stepKey="seeProductName6"/>
165175
<see selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createProduct12.name$$)}}"

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
<click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
2424
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
2525
<see userInput="You deleted the website." stepKey="seeSavedMessage"/>
26+
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter2"/>
2627
</actionGroup>
27-
</actionGroups>
28+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
1717
<element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
1818
<element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]" timeout="30"/>
19-
<element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
19+
<element name="resetButton" type="button" selector="button[title='Reset Filter']" timeout="30"/>
2020
<element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
2121
<element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
2222
<element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>

0 commit comments

Comments
 (0)