Skip to content

Commit 5e8ca3a

Browse files
shashikant.kumarshashikant.kumar
shashikant.kumar
authored and
shashikant.kumar
committed
AC-4948
Category Selector limit category upto 5 from the root
1 parent 24a2c46 commit 5e8ca3a

7 files changed

+148
-15
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCreateNewWidgetsOfCMSStaticBlockActionGroup.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenCreateNewWidgetsOfCMSStaticBlockActionGroup">
11+
<annotations>
12+
<description>Open create new Widgets.</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="WidgetType" type="string" defaultValue="Catalog Product Link"/>
16+
<argument name="WidgetTheme" type="string" defaultValue="Magento Luma"/>
17+
<argument name="WidgetDisplayOn" type="string"/>
18+
</arguments>
19+
<amOnPage url="{{CmsNewWidgetsPage.url}}" stepKey="navigateToCreateWidgetsPage"/>
20+
<waitForPageLoad stepKey="waitForWidgetPageToLoad"/>
21+
<selectOption selector="{{CmsNewWidgetsSettingSection.WidgetType}}" userInput="{{WidgetType}}" stepKey="selectCMSStaticBlock" />
22+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear1"/>
23+
<selectOption selector="{{CmsNewWidgetsSettingSection.WidgetTheme}}" userInput="{{WidgetTheme}}" stepKey="selectTemplate" />
24+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2"/>
25+
<click selector="{{CmsNewWidgetsSettingSection.ContinueButton}}" stepKey="clickContinueButton"/>
26+
<waitForPageLoad stepKey="waitForStorefrontPropertiesSectionToLoad"/>
27+
<click selector="{{CmsNewWidgetStorefrontPropertiesSection.AddLayout}}" stepKey="clickAddLayoutButton" />
28+
<scrollTo selector="{{CmsNewWidgetStorefrontPropertiesSection.AddLayout}}" stepKey="scrollToAddLayoutTab" />
29+
<waitForPageLoad stepKey="waitForAddLayoutTabToLoad"/>
30+
<selectOption selector="{{CmsNewWidgetUpdateLayoutSection.DisplayOn}}" userInput="{{WidgetDisplayOn}}" stepKey="selectDisplay"/>
31+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
32+
<selectOption selector="//input[@id='specific_anchor_categories_0']" userInput="Specific Categories" stepKey="selectSpecificCategoryRadioButton"/>
33+
<click selector="//*[@id='anchor_categories_ids_0']/p/a[1]/img" stepKey="clickCategoryChooserButton"/>
34+
<waitForPageLoad stepKey="waitForRootCategoryToLoad"/>
35+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="clickRootCat"/>
36+
<waitForPageLoad stepKey="waitForRootCategoryToExpand"/>
37+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="clickFirstSubCat"/>
38+
<waitForPageLoad stepKey="waitForFirstSubCatToExpand"/>
39+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandSecondSubCat"/>
40+
<waitForPageLoad stepKey="waitForSecondSubCatToExpand"/>
41+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandThirdFirstSubCat"/>
42+
<waitForPageLoad stepKey="waitForThirdSubCatToExpand"/>
43+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandFourthSubCat"/>
44+
<waitForPageLoad stepKey="waitForFourthSubCatToExpand"/>
45+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandFifthSubCat"/>
46+
<waitForPageLoad stepKey="waitForFifthSubCatToExpand"/>
47+
<grabMultiple selector="//*[@class='x-tree-ec-icon x-tree-elbow-end-minus' or @class='x-tree-ec-icon x-tree-elbow-end']" stepKey="countNestedCategory"/>
48+
<assertCount stepKey="check">
49+
<expectedResult type="int">7</expectedResult>
50+
<actualResult type="variable">countNestedCategory</actualResult>
51+
</assertCount>
52+
</actionGroup>
53+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,30 @@
107107
<data key="include_in_menu">true</data>
108108
<var key="parent_id" entityType="category" entityKey="id" />
109109
</entity>
110+
<entity name="Four_nested_categories" type="category">
111+
<data key="name" unique="suffix">FourthLevel</data>
112+
<data key="url_key" unique="suffix">fourthlevel</data>
113+
<data key="name_lwr" unique="suffix">fourthlevel</data>
114+
<data key="is_active">true</data>
115+
<data key="include_in_menu">true</data>
116+
<var key="parent_id" entityType="category" entityKey="id" />
117+
</entity>
118+
<entity name="Five_nested_categories" type="category">
119+
<data key="name" unique="suffix">FifthLevel</data>
120+
<data key="url_key" unique="suffix">fifthlevel</data>
121+
<data key="name_lwr" unique="suffix">fifthlevel</data>
122+
<data key="is_active">true</data>
123+
<data key="include_in_menu">true</data>
124+
<var key="parent_id" entityType="category" entityKey="id" />
125+
</entity>
126+
<entity name="Six_nested_categories" type="category">
127+
<data key="name" unique="suffix">SixthLevel</data>
128+
<data key="url_key" unique="suffix">sixthlevel</data>
129+
<data key="name_lwr" unique="suffix">sixthlevel</data>
130+
<data key="is_active">true</data>
131+
<data key="include_in_menu">true</data>
132+
<var key="parent_id" entityType="category" entityKey="id" />
133+
</entity>
110134
<entity name="CatNotIncludeInMenu" type="category">
111135
<data key="name" unique="suffix">NotInclMenu</data>
112136
<data key="name_lwr" unique="suffix">notinclemenu</data>

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
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="AdminValidateAllNestedCategoryInWidget">
12+
<annotations>
13+
<features value="Catalog"/>
14+
<stories value="All sub cat should shown"/>
15+
<title value="Category Selector limit category upto 5 from the root"/>
16+
<description value="Category Selector limit category more than 5 from the root"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-40114"/>
19+
<testCaseId value="AC-4948"/>
20+
</annotations>
21+
<before>
22+
<!-- Create six level nested category -->
23+
<createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
24+
<createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
25+
<requiredEntity createDataKey="createDefaultCategory"/>
26+
</createData>
27+
<createData entity="Three_nested_categories" stepKey="createThreeLevelNestedCategories">
28+
<requiredEntity createDataKey="createTwoLevelNestedCategories"/>
29+
</createData>
30+
<createData entity="Four_nested_categories" stepKey="createFourLevelNestedCategories">
31+
<requiredEntity createDataKey="createThreeLevelNestedCategories"/>
32+
</createData>
33+
<createData entity="Five_nested_categories" stepKey="createFiveLevelNestedCategories">
34+
<requiredEntity createDataKey="createFourLevelNestedCategories"/>
35+
</createData>
36+
<createData entity="Six_nested_categories" stepKey="createSixLevelNestedCategories">
37+
<requiredEntity createDataKey="createFiveLevelNestedCategories"/>
38+
</createData>
39+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
40+
</before>
41+
<after>
42+
<deleteData createDataKey="createSixLevelNestedCategories" stepKey="deleteSixNestedCategories"/>
43+
<deleteData createDataKey="createFiveLevelNestedCategories" stepKey="deleteFiveNestedCategories"/>
44+
<deleteData createDataKey="createFourLevelNestedCategories" stepKey="deleteFourNestedCategories"/>
45+
<deleteData createDataKey="createThreeLevelNestedCategories" stepKey="deleteThreeNestedCategories"/>
46+
<deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteTwoLevelNestedCategory"/>
47+
<deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
48+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
49+
</after>
50+
<!--Main test-->
51+
<actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToContentPagesPage">
52+
<argument name="menuUiId" value="{{AdminMenuContent.dataUiId}}"/>
53+
<argument name="submenuUiId" value="{{AdminMenuContentElementsWidgets.dataUiId}}"/>
54+
</actionGroup>
55+
<actionGroup ref="AdminOpenCreateNewWidgetsOfCMSStaticBlockActionGroup" stepKey="createWidget">
56+
<argument name="WidgetType" value="CMS Static Block"/>
57+
<argument name="WidgetTheme" value="Magento Luma"/>
58+
<argument name="WidgetDisplayOn" value="Anchor Categories"/>
59+
</actionGroup>
60+
</test>
61+
</tests>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewWidgetsOfCatalogProductLinkActionGroup.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<argument name="WidgetType" type="string" defaultValue="Catalog Product Link"/>
1616
<argument name="WidgetTheme" type="string" defaultValue="Magento Luma"/>
1717
<argument name="WidgetTitle" type="string" defaultValue="NewWidget"/>
18-
<argument name="AssigntoStoreViews" type="string" defaultValue="All Store Views"/>
18+
<argument name="AssignToStoreViews" type="string" defaultValue="All Store Views"/>
1919
<argument name="WidgetDisplayOn" type="string" defaultValue="All Pages"/>
2020
<argument name="Container" type="string" defaultValue="Main Content Area"/>
2121
<argument name="Template" type="string" defaultValue="Product Link Block Template"/>
@@ -31,10 +31,10 @@
3131
<click selector="{{CmsNewWidgetsSettingSection.ContinueButton}}" stepKey="clickContinueButton"/>
3232
<waitForPageLoad stepKey="wait2"/>
3333

34-
<fillField selector="{{CmsNewWidgetStoreforntPropertiesSection.WidgetTitle}}" userInput="{{WidgetTitle}}" stepKey="fillFieldTitle"/>
35-
<selectOption selector="{{CmsNewWidgetStoreforntPropertiesSection.AssigntoStoreViews}}" userInput="{{AssigntoStoreViews}}" stepKey="selectView"/>
36-
<click selector="{{CmsNewWidgetStoreforntPropertiesSection.AddLayout}}" stepKey="clickAddLayoutButton"/>
37-
<scrollTo selector="{{CmsNewWidgetStoreforntPropertiesSection.AddLayout}}" stepKey="scrollToAddLayoutTab"/>
34+
<fillField selector="{{CmsNewWidgetStorefrontPropertiesSection.WidgetTitle}}" userInput="{{WidgetTitle}}" stepKey="fillFieldTitle"/>
35+
<selectOption selector="{{CmsNewWidgetStorefrontPropertiesSection.AssignToStoreViews}}" userInput="{{AssignToStoreViews}}" stepKey="selectView"/>
36+
<click selector="{{CmsNewWidgetStorefrontPropertiesSection.AddLayout}}" stepKey="clickAddLayoutButton"/>
37+
<scrollTo selector="{{CmsNewWidgetStorefrontPropertiesSection.AddLayout}}" stepKey="scrollToAddLayoutTab"/>
3838
<waitForPageLoad stepKey="wait3"/>
3939

4040
<selectOption selector="{{CmsNewWidgetUpdateLayoutSection.DisplayOn}}" userInput="{{WidgetDisplayOn}}" stepKey="selectDispaly"/>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminUpdateWidgetsOfCatalogProductLinkActionGroup.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
<arguments>
1515
<argument name="WidgetTitle" type="string" defaultValue="Catalog B Product Link"/>
1616
</arguments>
17-
1817
<click selector="{{CmsNewWidgetOptionsSection.FirstWidget}}" stepKey="clickFirstWidgetSelect"/>
1918
<waitForPageLoad stepKey="wait2"/>
20-
21-
<clearField selector="{{CmsNewWidgetStoreforntPropertiesSection.WidgetTitle}}" stepKey="clearWidgetTitle"/>
22-
<fillField selector="{{CmsNewWidgetStoreforntPropertiesSection.WidgetTitle}}" userInput="{{WidgetTitle}}" stepKey="fillFieldTitle"/>
23-
19+
<clearField selector="{{CmsNewWidgetStorefrontPropertiesSection.WidgetTitle}}" stepKey="clearWidgetTitle"/>
20+
<fillField selector="{{CmsNewWidgetStorefrontPropertiesSection.WidgetTitle}}" userInput="{{WidgetTitle}}" stepKey="fillFieldTitle"/>
2421
<click selector="{{CmsNewWidgetOptionsSection.WidgetOptions}}" stepKey="clickButton23"/>
2522
<waitForPageLoad stepKey="wait3"/>
2623
<click selector="{{CmsNewWidgetOptionsSection.SelectProduct}}" stepKey="clickSelectProductButton1"/>
@@ -29,8 +26,6 @@
2926
<waitForPageLoad stepKey="wait5"/>
3027
<click selector="{{CmsNewWidgetOptionsSection.SaveWidget}}" stepKey="clickSaveWidgetButton2"/>
3128
<waitForPageLoad stepKey="wait6"/>
32-
3329
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
34-
3530
</actionGroup>
3631
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/CmsNewWidgetStoreforntPropertiesSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11-
<section name="CmsNewWidgetStoreforntPropertiesSection">
11+
<section name="CmsNewWidgetStorefrontPropertiesSection">
1212
<element name="WidgetTitle" type="text" selector="#title"/>
13-
<element name="AssigntoStoreViews" type="button" selector="#store_ids"/>
13+
<element name="AssignToStoreViews" type="button" selector="#store_ids"/>
1414
<element name="AddLayout" type="button" selector="//span[contains(text(),'Add Layout Update')]"/>
1515
</section>
1616
</sections>

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddUpdateDeleteWidgetOfTypeCatalogProductLinkTypeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<argument name="WidgetType" value="Catalog Product Link"/>
4040
<argument name="WidgetTheme" value="Magento Luma"/>
4141
<argument name="WidgetTitle" value="NewWidget"/>
42-
<argument name="AssigntoStoreViews" value="All Store Views"/>
42+
<argument name="AssignToStoreViews" value="All Store Views"/>
4343
<argument name="WidgetDisplayOn" value="All Pages"/>
4444
<argument name="Container" value="Main Content Area"/>
4545
<argument name="Template" value="Product Link Block Template"/>

0 commit comments

Comments
 (0)