Skip to content

Commit d556db1

Browse files
kate-kyzymakate-kyzyma
committed
Refactoring the test
1 parent c403a90 commit d556db1

File tree

2 files changed

+60
-16
lines changed

2 files changed

+60
-16
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminDisableIncludeInMenuConfigActionGroup">
12+
<annotations>
13+
<description>Set "Include in Menu" option to No for Category</description>
14+
</annotations>
15+
16+
<click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="setIncludeInMenuSelectToNo"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 42 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
<testCaseId value="MAGETWO-72238"/>
1919
<group value="category"/>
2020
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
23+
24+
<!-- Create one category -->
25+
<createData entity="SimpleSubCategory" stepKey="simpleCategory">
26+
</createData>
27+
<!-- Create second category, having as parent the 1st one -->
28+
<createData entity="SubCategoryWithParent" stepKey="subCategory">
29+
<requiredEntity createDataKey="SimpleSubCategory"/>
30+
</createData>
31+
32+
</before>
2133
<after>
2234
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage2"/>
2335

@@ -27,28 +39,42 @@
2739
</actionGroup>
2840
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2941
</after>
30-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
31-
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage1"/>
32-
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
33-
<!--Create new category under Default Category-->
34-
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory1">
35-
<argument name="categoryEntity" value="SimpleSubCategory"/>
36-
</actionGroup>
37-
<!--Create another subcategory under created category-->
38-
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory2">
39-
<argument name="categoryEntity" value="SubCategoryWithParent"/>
40-
</actionGroup>
42+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage"/>
43+
<!--<scrollToTopOfPage stepKey="scrollToTopOfPage"/>-->
44+
45+
<!--&lt;!&ndash;Create new category under Default Category&ndash;&gt;-->
46+
<!--<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory">-->
47+
<!--<argument name="categoryEntity" value="SimpleSubCategory"/>-->
48+
<!--</actionGroup>-->
49+
<!--&lt;!&ndash;Create another subcategory under created category&ndash;&gt;-->
50+
<!--<actionGroup ref="CreateCategoryActionGroup" stepKey="createSecondSubcategory">-->
51+
<!--<argument name="categoryEntity" value="SubCategoryWithParent"/>-->
52+
<!--</actionGroup>-->
53+
4154
<!--Go to storefront and verify visibility of categories-->
4255
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage"/>
43-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSimpleSubCategoryOnStorefront1"/>
44-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront1"/>
56+
<!--<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSimpleSubCategoryOnStorefront1"/>-->
57+
<!--<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront1"/>-->
58+
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeFirstSubCategoryOnStorefront">
59+
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
60+
</actionGroup>
61+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeSecondSubCategoryOnStorefront">
62+
<argument name="categoryName" value="{{SubCategoryWithParent.name}}"/>
63+
</actionGroup>
4564
<!--Set Include in menu to No on created category under Default Category -->
4665
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage2"/>
47-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory1"/>
48-
<click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="setNoToIncludeInMenuSelect"/>
49-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton1"/>
66+
<!--<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory1"/>-->
67+
<!--<click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="setNoToIncludeInMenuSelect"/>-->
68+
<!--<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton1"/>-->
69+
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedCategory">
70+
<argument name="Category" value="$$simpleCategory$$"/>
71+
</actionGroup>
72+
<actionGroup ref="AdminDisableIncludeInMenuConfigActionGroup" stepKey="setNoToIncludeInMenuSelect"/>
73+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
74+
5075
<seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="seeCheckboxEnableCategoryIsChecked"/>
5176
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="dontSeeCheckboxIncludeInMenuIsChecked"/>
77+
5278
<!--Go to storefront and verify visibility of categories-->
5379
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage2"/>
5480
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront1"/>

0 commit comments

Comments
 (0)