Skip to content

Commit 84b7d39

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/MAGETWO-98748' into EPAM-PR-73
2 parents dd5a687 + 4378081 commit 84b7d39

File tree

3 files changed

+111
-3
lines changed

3 files changed

+111
-3
lines changed

‎app/code/Magento/Catalog/Plugin/Block/Topmenu.php

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Catalog\Plugin\Block;
79

810
use Magento\Catalog\Model\Category;
@@ -156,12 +158,13 @@ private function getCurrentCategory()
156158
*/
157159
private function getCategoryAsArray($category, $currentCategory, $isParentActive)
158160
{
161+
$categoryId = $category->getId();
159162
return [
160163
'name' => $category->getName(),
161-
'id' => 'category-node-' . $category->getId(),
164+
'id' => 'category-node-' . $categoryId,
162165
'url' => $this->catalogCategory->getCategoryUrl($category),
163-
'has_active' => in_array((string)$category->getId(), explode('/', $currentCategory->getPath()), true),
164-
'is_active' => $category->getId() == $currentCategory->getId(),
166+
'has_active' => in_array((string)$categoryId, explode('/', (string)$currentCategory->getPath()), true),
167+
'is_active' => $categoryId == $currentCategory->getId(),
165168
'is_category' => true,
166169
'is_parent_active' => $isParentActive
167170
];
@@ -193,4 +196,22 @@ protected function getCategoryTree($storeId, $rootId)
193196

194197
return $collection;
195198
}
199+
200+
/**
201+
* Add active
202+
*
203+
* @param \Magento\Theme\Block\Html\Topmenu $subject
204+
* @param string[] $result
205+
* @return string[]
206+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
207+
*/
208+
public function afterGetCacheKeyInfo(\Magento\Theme\Block\Html\Topmenu $subject, array $result)
209+
{
210+
$activeCategory = $this->getCurrentCategory();
211+
if ($activeCategory) {
212+
$result[] = Category::CACHE_TAG . '_' . $activeCategory->getId();
213+
}
214+
215+
return $result;
216+
}
196217
}

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<section name="AdminCategorySidebarTreeSection">
1212
<element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
1313
<element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
14+
<element name="categoryHighlighted" type="text" selector="//div[@id='store.menu']//span[contains(text(),'{{name}}')]/ancestor::li" parameterized="true" timeout="30"/>
15+
<element name="categoryNotHighlighted" type="text" selector="ul[id=\'ui-id-2\'] li[class~=\'active\']" timeout="30"/>
1416
<element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
1517
<element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
1618
<element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>

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

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontCategoryHighlightedAndProductDisplayedTest">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="Category"/>
15+
<title value="Сheck that current category is highlighted and all products displayed for it"/>
16+
<description value="Сheck that current category is highlighted and all products displayed for it"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-19626"/>
19+
<useCaseId value="MAGETWO-98748"/>
20+
<group value="Catalog"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<createData entity="SimpleSubCategory" stepKey="category1"/>
25+
<createData entity="SimpleSubCategory" stepKey="category2"/>
26+
<createData entity="SimpleSubCategory" stepKey="category3"/>
27+
<createData entity="SimpleSubCategory" stepKey="category4"/>
28+
<createData entity="SimpleProduct" stepKey="product1">
29+
<requiredEntity createDataKey="category1"/>
30+
</createData>
31+
<createData entity="SimpleProduct" stepKey="product2">
32+
<requiredEntity createDataKey="category1"/>
33+
</createData>
34+
<createData entity="SimpleProduct" stepKey="product3">
35+
<requiredEntity createDataKey="category2"/>
36+
</createData>
37+
<createData entity="SimpleProduct" stepKey="product4">
38+
<requiredEntity createDataKey="category2"/>
39+
</createData>
40+
</before>
41+
<after>
42+
<deleteData createDataKey="product1" stepKey="deleteProduct1"/>
43+
<deleteData createDataKey="product2" stepKey="deleteProduct2"/>
44+
<deleteData createDataKey="product3" stepKey="deleteProduct3"/>
45+
<deleteData createDataKey="product4" stepKey="deleteProduct4"/>
46+
<deleteData createDataKey="category1" stepKey="deleteCategory1"/>
47+
<deleteData createDataKey="category2" stepKey="deleteCategory2"/>
48+
<deleteData createDataKey="category3" stepKey="deleteCategory3"/>
49+
<deleteData createDataKey="category4" stepKey="deleteCategory4"/>
50+
<actionGroup ref="logout" stepKey="logout"/>
51+
</after>
52+
<!--Open Storefront home page-->
53+
<comment userInput="Open Storefront home page" stepKey="openStorefrontHomePage"/>
54+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefrontHomePage"/>
55+
<waitForPageLoad stepKey="waitForSimpleProductPage"/>
56+
<!--Click on first category-->
57+
<comment userInput="Click on first category" stepKey="openFirstCategoryPage"/>
58+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$category1.name$$)}}" stepKey="clickCategory1Name"/>
59+
<waitForPageLoad stepKey="waitForCategory1Page"/>
60+
<!--Check if current category is highlighted and the others are not-->
61+
<comment userInput="Check if current category is highlighted and the others are not" stepKey="checkCateg1NameIsHighlighted"/>
62+
<grabAttributeFrom selector="{{AdminCategorySidebarTreeSection.categoryHighlighted($$category1.name$$)}}" userInput="class" stepKey="grabCategory1Class"/>
63+
<assertContains expectedType="string" expected="active" actual="$grabCategory1Class" stepKey="assertCategory1IsHighlighted"/>
64+
<executeJS function="return document.querySelectorAll('{{AdminCategorySidebarTreeSection.categoryNotHighlighted}}').length" stepKey="highlightedAmount"/>
65+
<assertEquals expectedType="int" expected="1" actual="$highlightedAmount" stepKey="assertRestCategories1IsNotHighlighted"/>
66+
<!--See products in the category page-->
67+
<comment userInput="See products in the category page" stepKey="seeProductsInCategoryPage"/>
68+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($product1.name$)}}" stepKey="seeProduct1InCategoryPage"/>
69+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($product2.name$)}}" stepKey="seeProduct2InCategoryPage"/>
70+
<!--Click on second category-->
71+
<comment userInput="Click on second category" stepKey="openSecondCategoryPage"/>
72+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$category2.name$$)}}" stepKey="clickCategory2Name"/>
73+
<waitForPageLoad stepKey="waitForCategory2Page"/>
74+
<!--Check if current category is highlighted and the others are not-->
75+
<comment userInput="Check if current category is highlighted and the others are not" stepKey="checkCateg2NameIsHighlighted"/>
76+
<grabAttributeFrom selector="{{AdminCategorySidebarTreeSection.categoryHighlighted($$category2.name$$)}}" userInput="class" stepKey="grabCategory2Class"/>
77+
<assertContains expectedType="string" expected="active" actual="$grabCategory2Class" stepKey="assertCategory2IsHighlighted"/>
78+
<executeJS function="return document.querySelectorAll('{{AdminCategorySidebarTreeSection.categoryNotHighlighted}}').length" stepKey="highlightedAmount2"/>
79+
<assertEquals expectedType="int" expected="1" actual="$highlightedAmount2" stepKey="assertRestCategories1IsNotHighlighted2"/>
80+
<!--Assert products in second category page-->
81+
<comment userInput="Assert products in second category page" stepKey="commentAssertProducts"/>
82+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($product3.name$)}}" stepKey="seeProduct3InCategoryPage"/>
83+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($product4.name$)}}" stepKey="seeProduct4InCategoryPage"/>
84+
</test>
85+
</tests>

0 commit comments

Comments
 (0)