Skip to content

Commit 51b53be

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #30170: Fix compatibility with phpunit 9.3 in integration and api functional tests (by @ihor-sviziev) - #30139: Bugfix/wrong size attributes in image with border (by @GrimLink) - #29722: Add Regions for Uruguay. (by @barbanet) - #28995: honor queue_consumer.xml maxMessages (by @AntonEvers) - #30160: Return correct type (by @kassner) - #30120: Cleaned up duplicate variable assignments in the same line (by @bgorski) - #30109: incorrect method description (by @milindsingh) - #30049: MFTF: Replace repetitive actions with Action Groups in AdminUpdateCategoryAndMakeInactiveTest and VerifyChildCategoriesShouldNotIncludeInMenuTest (by @kate-kyzyma) - #30182: Fix PHPDoc param attribute is not always a string (by @FredericMartinez) Fixed GitHub Issues: - #30146: Integration Test Framework do not work out the box. Not compatible with PhpUnit 9.3.x (reported by @revgovmade) has been fixed in #30170 by @ihor-sviziev in 2.4-develop branch Related commits: 1. 62cad12 - #30186: [Issue] Bugfix/wrong size attributes in image with border (reported by @m2-assistant[bot]) has been fixed in #30139 by @GrimLink in 2.4-develop branch Related commits: 1. 395907d 2. 5092948 3. fe5be17 4. 1adc538 5. 3d609a9 6. 7fd7a68 - #29729: [Issue] Add Regions for Uruguay. (reported by @m2-assistant[bot]) has been fixed in #29722 by @barbanet in 2.4-develop branch Related commits: 1. b7cec7d 2. 37675cc 3. c62d33a - #29522: [Issue] honor queue_consumer.xml maxMessages (reported by @m2-assistant[bot]) has been fixed in #28995 by @AntonEvers in 2.4-develop branch Related commits: 1. af828b7 2. a544354 3. 02b3ba0 - #30133: [Issue] Cleaned up duplicate variable assignments in the same line (reported by @m2-assistant[bot]) has been fixed in #30120 by @bgorski in 2.4-develop branch Related commits: 1. baea0a2 2. 4153286 3. 7f2a29f 4. 41b265e - #30125: [Issue] incorrect method description (reported by @m2-assistant[bot]) has been fixed in #30109 by @milindsingh in 2.4-develop branch Related commits: 1. 7667e6a - #30058: [Issue] MFTF: Replace repetitive actions with Action Groups in AdminUpdateCategoryAndMakeInactiveTest and VerifyChildCategoriesShouldNotIncludeInMenuTest (reported by @m2-assistant[bot]) has been fixed in #30049 by @kate-kyzyma in 2.4-develop branch Related commits: 1. 139a17f 2. c403a90 3. d556db1 4. 7da410a 5. 5e9c8e7 6. c7f6564 7. 17ef4a7 8. 4d1cf82 9. 2afae11 10. f5e9cdf 11. 1f4a11e - #30191: [Issue] Fix PHPDoc param attribute is not always a string (reported by @m2-assistant[bot]) has been fixed in #30182 by @FredericMartinez in 2.4-develop branch Related commits: 1. f2b20d1 2. 6b84d0a
2 parents fbfac3e + 9e46f6b commit 51b53be

File tree

30 files changed

+518
-126
lines changed

30 files changed

+518
-126
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDisableActiveCategoryActionGroup.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="AdminDisableActiveCategoryActionGroup">
12+
<annotations>
13+
<description>Disable an active category</description>
14+
</annotations>
15+
16+
<click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableActiveCategory"/>
17+
</actionGroup>
18+
</actionGroups>

‎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/ActionGroup/AdminIncludeInMenuExcludedCategoryActionGroup.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="AdminIncludeInMenuExcludedCategoryActionGroup">
12+
<annotations>
13+
<description>Include to menu the excluded category</description>
14+
</annotations>
15+
16+
<click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="includeToMenuCategory"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIncludedToMenuActionGroup.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="AssertAdminCategoryIncludedToMenuActionGroup">
12+
<annotations>
13+
<description>Verify the category is included to menu</description>
14+
</annotations>
15+
16+
<seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="seeCheckboxIncludeInMenuIsChecked"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsEnabledActionGroup.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="AssertAdminCategoryIsEnabledActionGroup">
12+
<annotations>
13+
<description>Verify the category is enabled</description>
14+
</annotations>
15+
16+
<seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="seeCategoryIsEnabled"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsNotIncludeInMenuActionGroup.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="AssertAdminCategoryIsNotIncludeInMenuActionGroup">
12+
<annotations>
13+
<description>Verify the category is not included in menu</description>
14+
</annotations>
15+
16+
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="dontSeeCategoryIncludeInMenu"/>
17+
</actionGroup>
18+
</actionGroups>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AssertAdminCategoryPageTitleActionGroup">
12+
<arguments>
13+
<argument name="categoryName" type="string"/>
14+
</arguments>
15+
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{categoryName}}" stepKey="seeProperPageTitle"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,35 @@
3030
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
3131

3232
<!--Update category and make category inactive-->
33-
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
34-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
35-
<click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
33+
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedCategory">
34+
<argument name="Category" value="$$createDefaultCategory$$"/>
35+
</actionGroup>
36+
<actionGroup ref="AdminDisableActiveCategoryActionGroup" stepKey="disableCategory"/>
3637
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
3738
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
38-
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
39-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
39+
<actionGroup ref="AssertAdminCategoryPageTitleActionGroup" stepKey="seePageTitle">
40+
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
41+
</actionGroup>
42+
<actionGroup ref="AssertAdminCategoryIsInactiveActionGroup" stepKey="seeDisabledCategory"/>
4043

4144
<!--Verify Inactive Category is store front page-->
42-
<amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="amOnCategoryPage"/>
43-
<waitForPageLoad stepKey="waitForPageToBeLoaded"/>
44-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreNavigationBar"/>
45-
<waitForPageLoad time="15" stepKey="wait"/>
45+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
46+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeCategoryNameInMenu">
47+
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
48+
</actionGroup>
4649

4750
<!--Verify Inactive Category in category page -->
48-
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
49-
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree1"/>
50-
<seeElement selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="assertCategoryInTree" />
51-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory1"/>
52-
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle1" />
53-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="assertCategoryIsInactive"/>
51+
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToAdminCategoryIndexPage"/>
52+
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandCategoryTree"/>
53+
<actionGroup ref="AssertAdminCategoryIsListedInCategoriesTreeActionGroup" stepKey="seeCategoryInTree">
54+
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
55+
</actionGroup>
56+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
57+
<argument name="category" value="$$createDefaultCategory$$"/>
58+
</actionGroup>
59+
<actionGroup ref="AssertAdminCategoryPageTitleActionGroup" stepKey="seeCategoryPageTitle">
60+
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
61+
</actionGroup>
62+
<actionGroup ref="AssertAdminCategoryIsInactiveActionGroup" stepKey="assertCategoryIsInactive"/>
5463
</test>
5564
</tests>

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

Lines changed: 67 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,63 +18,83 @@
1818
<testCaseId value="MAGETWO-72238"/>
1919
<group value="category"/>
2020
</annotations>
21+
<before>
22+
<!-- Create a category -->
23+
<createData entity="ApiCategory" stepKey="simpleCategory"/>
24+
<!-- Create second category, having as parent the 1st one -->
25+
<createData entity="SubCategoryWithParent" stepKey="simpleSubCategory">
26+
<requiredEntity createDataKey="simpleCategory"/>
27+
</createData>
28+
</before>
2129
<after>
22-
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage2"/>
23-
24-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategoryBeforeDelete"/>
25-
<actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory">
26-
<argument name="categoryEntity" value="SimpleSubCategory"/>
27-
</actionGroup>
30+
<deleteData createDataKey="simpleSubCategory" stepKey="deleteSubCategory"/>
31+
<deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
2832
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
2933
</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>
34+
4135
<!--Go to storefront and verify visibility of categories-->
4236
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage"/>
43-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSimpleSubCategoryOnStorefront1"/>
44-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront1"/>
37+
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCreatedCategoryOnStorefront">
38+
<argument name="categoryName" value="$$simpleCategory.name$$"/>
39+
</actionGroup>
40+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeSubCategoryOnStorefront">
41+
<argument name="categoryName" value="$$simpleSubCategory.name$$"/>
42+
</actionGroup>
43+
4544
<!--Set Include in menu to No on created category under Default Category -->
46-
<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"/>
50-
<seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="seeCheckboxEnableCategoryIsChecked"/>
51-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="dontSeeCheckboxIncludeInMenuIsChecked"/>
45+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
46+
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openParentCategoryViaAdmin">
47+
<argument name="Category" value="$$simpleCategory$$"/>
48+
</actionGroup>
49+
<actionGroup ref="AdminDisableIncludeInMenuConfigActionGroup" stepKey="setNoToIncludeInMenuSelect"/>
50+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
51+
<actionGroup ref="AssertAdminCategoryIsEnabledActionGroup" stepKey="assertParentCategoryIsActive"/>
52+
<actionGroup ref="AssertAdminCategoryIsNotIncludeInMenuActionGroup" stepKey="assertParentCategoryIsNotIncludeInMenu"/>
53+
5254
<!--Go to storefront and verify visibility of categories-->
53-
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage2"/>
54-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront1"/>
55-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront2"/>
55+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPageSecondTime"/>
56+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeParentCategoryOnStorefront">
57+
<argument name="categoryName" value="$$simpleCategory.name$$"/>
58+
</actionGroup>
59+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeSubCategory">
60+
<argument name="categoryName" value="$$simpleSubCategory.name$$"/>
61+
</actionGroup>
62+
5663
<!--Set Enable category to No and Include in menu to Yes on created category under Default Category -->
57-
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage3"/>
58-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory2"/>
59-
<click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="SetNoToEnableCategorySelect"/>
60-
<click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="SetYesToIncludeInMenuSelect"/>
61-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton2"/>
62-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontSeeCheckboxEnableCategoryIsChecked"/>
63-
<seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="seeCheckboxIncludeInMenuIsChecked"/>
64+
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openParentCategoryViaAdminSecondTime">
65+
<argument name="Category" value="$$simpleCategory$$"/>
66+
</actionGroup>
67+
<actionGroup ref="AdminDisableActiveCategoryActionGroup" stepKey="SetNoToEnableCategorySelect"/>
68+
<actionGroup ref="AdminIncludeInMenuExcludedCategoryActionGroup" stepKey="SetToYesIncludeInMenuSelect"/>
69+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveParentCategory"/>
70+
<actionGroup ref="AssertAdminCategoryIsInactiveActionGroup" stepKey="seeCategoryIsDisabled"/>
71+
<actionGroup ref="AssertAdminCategoryIncludedToMenuActionGroup" stepKey="seeCheckboxIncludeInMenuIsChecked"/>
72+
6473
<!--Go to storefront and verify visibility of categories-->
65-
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage3"/>
66-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront2"/>
67-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront3"/>
74+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPageThirdTime"/>
75+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeCategoryInMenuOnStorefront">
76+
<argument name="categoryName" value="$$simpleCategory.name$$"/>
77+
</actionGroup>
78+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeSubCategoryInMenuOnStorefront">
79+
<argument name="categoryName" value="$$simpleSubCategory.name$$"/>
80+
</actionGroup>
81+
6882
<!--Set Enable category to No and Include in menu to No on created category under Default Category -->
69-
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPage4"/>
70-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="clickOnCreatedSimpleSubCategory3"/>
71-
<click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="setNoToIncludeInMenuSelect2"/>
72-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton3"/>
73-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontSeeCheckboxEnableCategoryIsChecked2"/>
74-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="dontSeeCheckboxIncludeInMenuIsChecked2"/>
83+
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openParentCategoryViaAdminThirdTime">
84+
<argument name="Category" value="$$simpleCategory$$"/>
85+
</actionGroup>
86+
<actionGroup ref="AdminDisableIncludeInMenuConfigActionGroup" stepKey="setNoToIncludeInMenuForParentCategory"/>
87+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveChanges"/>
88+
<actionGroup ref="AssertAdminCategoryIsInactiveActionGroup" stepKey="assertCategoryIsDisabled"/>
89+
<actionGroup ref="AssertAdminCategoryIsNotIncludeInMenuActionGroup" stepKey="assertParentCategoryIsNotIncludeToMenu"/>
90+
7591
<!--Go to storefront and verify visibility of categories-->
76-
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage4"/>
77-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSimpleSubCategoryOnStorefront3"/>
78-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SubCategoryWithParent.name)}}" stepKey="dontSeeSubCategoryWithParentOnStorefront4"/>
92+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPageFourthTime"/>
93+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeCategoryOnStorefront">
94+
<argument name="categoryName" value="$$simpleCategory.name$$"/>
95+
</actionGroup>
96+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeSubCategoryInMenu">
97+
<argument name="categoryName" value="$$simpleSubCategory.name$$"/>
98+
</actionGroup>
7999
</test>
80100
</tests>

0 commit comments

Comments
 (0)