Skip to content

Commit 7c298fa

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 5b6a6a0 commit 7c298fa

File tree

5 files changed

+81
-27
lines changed

5 files changed

+81
-27
lines changed

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

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
<argument name="WidgetType" type="string" defaultValue="Catalog Product Link"/>
1616
<argument name="WidgetTheme" type="string" defaultValue="Magento Luma"/>
1717
<argument name="WidgetDisplayOn" type="string"/>
18-
19-
<argument name="RootCat" type="string" defaultValue="Default Category"/>
20-
<argument name="FirstSubCat" type="string"/>
21-
<argument name="SecondSubCat" type="string"/>
22-
<argument name="ThirdSubCat" type="string"/>
23-
<argument name="FourthSubCat" type="string"/>
24-
<argument name="FifthSubCat" type="string"/>
2518
</arguments>
2619
<amOnPage url="{{CmsNewWidgetsPage.url}}" stepKey="navigateToCreateWidgetsPage"/>
2720
<waitForPageLoad stepKey="waitForWidgetPageToLoad"/>
@@ -31,27 +24,27 @@
3124
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear2"/>
3225
<click selector="{{CmsNewWidgetsSettingSection.ContinueButton}}" stepKey="clickContinueButton"/>
3326
<waitForPageLoad stepKey="waitForStorefrontPropertiesSectionToLoad"/>
34-
<click selector="{{CmsNewWidgetStoreforntPropertiesSection.AddLayout}}" stepKey="clickAddLayoutButton" />
35-
<scrollTo selector="{{CmsNewWidgetStoreforntPropertiesSection.AddLayout}}" stepKey="scrollToAddLayoutTab" />
27+
<click selector="{{CmsNewWidgetStorefrontPropertiesSection.AddLayout}}" stepKey="clickAddLayoutButton" />
28+
<scrollTo selector="{{CmsNewWidgetStorefrontPropertiesSection.AddLayout}}" stepKey="scrollToAddLayoutTab" />
3629
<waitForPageLoad stepKey="waitForAddLayoutTabToLoad"/>
3730
<selectOption selector="{{CmsNewWidgetUpdateLayoutSection.DisplayOn}}" userInput="{{WidgetDisplayOn}}" stepKey="selectDisplay"/>
3831
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
39-
<selectOption selector="{{CmsNewWidgetUpdateLayoutSection.SpecificCategories}}" userInput="Specific Categories" stepKey="selectSpecificCategoryRadioButton"/>
40-
<click selector="{{CmsNewWidgetUpdateLayoutSection.CategoryChooserButton}}" stepKey="clickCategoryChooserButton"/>
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"/>
4134
<waitForPageLoad stepKey="waitForRootCategoryToLoad"/>
42-
<click selector="{{CmsNewWidgetUpdateLayoutSection.RootCat(RootCat)}}" stepKey="clickRootCat"/>
35+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="clickRootCat"/>
4336
<waitForPageLoad stepKey="waitForRootCategoryToExpand"/>
44-
<click selector="{{CmsNewWidgetUpdateLayoutSection.FirstSubCat(FirstSubCat)}}" stepKey="clickFirstSubCat"/>
37+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="clickFirstSubCat"/>
4538
<waitForPageLoad stepKey="waitForFirstSubCatToExpand"/>
46-
<click selector="{{CmsNewWidgetUpdateLayoutSection.SecondSubCat(SecondSubCat)}}" stepKey="expandSecondSubCat"/>
39+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandSecondSubCat"/>
4740
<waitForPageLoad stepKey="waitForSecondSubCatToExpand"/>
48-
<click selector="{{CmsNewWidgetUpdateLayoutSection.ThirdSubCat(ThirdSubCat)}}" stepKey="expandThirdFirstSubCat"/>
41+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandThirdFirstSubCat"/>
4942
<waitForPageLoad stepKey="waitForThirdSubCatToExpand"/>
50-
<click selector="{{CmsNewWidgetUpdateLayoutSection.FourthSubCat(FourthSubCat)}}" stepKey="expandFourthSubCat"/>
43+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandFourthSubCat"/>
5144
<waitForPageLoad stepKey="waitForFourthSubCatToExpand"/>
52-
<click selector="{{CmsNewWidgetUpdateLayoutSection.FifthSubCat(FifthSubCat)}}" stepKey="expandFifthSubCat"/>
45+
<click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandFifthSubCat"/>
5346
<waitForPageLoad stepKey="waitForFifthSubCatToExpand"/>
54-
<grabMultiple selector="{{CmsNewWidgetUpdateLayoutSection.CountAllNestedCat}}" stepKey="countNestedCategory"/>
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"/>
5548
<assertCount stepKey="check">
5649
<expectedResult type="int">7</expectedResult>
5750
<actualResult type="variable">countNestedCategory</actualResult>

‎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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
</arguments>
1717
<click selector="{{CmsNewWidgetOptionsSection.FirstWidget}}" stepKey="clickFirstWidgetSelect"/>
1818
<waitForPageLoad stepKey="wait2"/>
19-
<clearField selector="{{CmsNewWidgetStoreforntPropertiesSection.WidgetTitle}}" stepKey="clearWidgetTitle"/>
20-
<fillField selector="{{CmsNewWidgetStoreforntPropertiesSection.WidgetTitle}}" userInput="{{WidgetTitle}}" stepKey="fillFieldTitle"/>
19+
<clearField selector="{{CmsNewWidgetStorefrontPropertiesSection.WidgetTitle}}" stepKey="clearWidgetTitle"/>
20+
<fillField selector="{{CmsNewWidgetStorefrontPropertiesSection.WidgetTitle}}" userInput="{{WidgetTitle}}" stepKey="fillFieldTitle"/>
2121
<click selector="{{CmsNewWidgetOptionsSection.WidgetOptions}}" stepKey="clickButton23"/>
2222
<waitForPageLoad stepKey="wait3"/>
2323
<click selector="{{CmsNewWidgetOptionsSection.SelectProduct}}" stepKey="clickSelectProductButton1"/>

‎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>

0 commit comments

Comments
 (0)