Skip to content

Commit aa814a7

Browse files
slavvkaslavvka
authored
ENGCOM-7676: MFTF: Refactoring AdminDeleteRootCategoryTest and AdminDeleteRootSubCategor… #28684 
2 parents 0a7a863 + 49fe9fb commit aa814a7

4 files changed

+69
-43
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsListedInCategoriesTreeActionGroup.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="AssertAdminCategoryIsListedInCategoriesTreeActionGroup">
12+
<arguments>
13+
<argument name="categoryName" type="string"/>
14+
</arguments>
15+
<seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="seeCategoryInTree"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup.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="AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup">
12+
<arguments>
13+
<argument name="categoryName" type="string"/>
14+
</arguments>
15+
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="doNotSeeCategoryInTree"/>
16+
</actionGroup>
17+
</actionGroups>

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,19 @@
2727

2828
<!--Verify Created root Category-->
2929
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
30-
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
31-
<waitForPageLoad stepKey="waitForPageToLoad"/>
32-
<seeElement selector="{{AdminCategoryBasicFieldSection.CategoryNameInput(NewRootCategory.name)}}" stepKey="seeRootCategory"/>
30+
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandCategoryTree"/>
31+
<actionGroup ref="AssertAdminCategoryIsListedInCategoriesTreeActionGroup" stepKey="seeRootCategory">
32+
<argument name="categoryName" value="{{NewRootCategory.name}}"/>
33+
</actionGroup>
3334

3435
<!--Delete Root Category-->
3536
<deleteData createDataKey="rootCategory" stepKey="deleteRootCategory"/>
3637

3738
<!--Verify Root Category is not listed in backend-->
3839
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
39-
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories1"/>
40-
<dontSee selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewRootCategory.name}}" stepKey="dontSeeRootCategory"/>
40+
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandTheCategoryTree"/>
41+
<actionGroup ref="AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup" stepKey="doNotSeeRootCategory">
42+
<argument name="categoryName" value="{{NewRootCategory.name}}"/>
43+
</actionGroup>
4144
</test>
4245
</tests>

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

Lines changed: 27 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,59 +33,48 @@
3333
</after>
3434

3535
<!--Create a Store-->
36-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
37-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
38-
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
39-
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
40-
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
41-
<selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
42-
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
43-
<see userInput="You saved the store." stepKey="seeSaveMessage"/>
36+
<actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
37+
<argument name="website" value="{{_defaultWebsite.name}}"/>
38+
<argument name="store" value="{{customStore.name}}"/>
39+
<argument name="rootCategory" value="{{NewRootCategory.name}}"/>
40+
</actionGroup>
4441

4542
<!--Create a Store View-->
46-
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
47-
<click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
48-
<selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
49-
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
50-
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
51-
<selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
52-
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
53-
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
54-
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
55-
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
56-
<waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
57-
<see userInput="You saved the store view." stepKey="seeSaveMessage1"/>
43+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
44+
<argument name="StoreGroup" value="customStore"/>
45+
<argument name="customStore" value="customStore"/>
46+
</actionGroup>
5847

5948
<!--Go To store front page-->
60-
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
61-
<waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
49+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
6250

6351
<!--Verify subcategory displayed in store front-->
64-
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
65-
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectMainWebsite1"/>
66-
<waitForPageLoad stepKey="waitForCategoryToLoad"/>
67-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFront"/>
52+
<actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="selectCustomStore">
53+
<argument name="storeName" value="{{customStore.name}}"/>
54+
</actionGroup>
55+
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
56+
<argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
57+
</actionGroup>
6858

6959
<!--Delete SubCategory-->
7060
<deleteData createDataKey="category" stepKey="deleteCategory"/>
7161

7262
<!--Verify Sub Category is absent in backend -->
7363
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
74-
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories2"/>
75-
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="dontSeeCategoryInTree"/>
64+
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandTheCategoryTree"/>
65+
<actionGroup ref="AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup" stepKey="doNotSeeRootCategory">
66+
<argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
67+
</actionGroup>
7668

7769
<!--Verify Sub Category is not present in Store Front-->
78-
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage1"/>
79-
<waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad2"/>
80-
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryInStoreFront"/>
70+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
71+
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeOldCategoryNameInStoreFront">
72+
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
73+
</actionGroup>
8174

8275
<!--Verify in Category is not in Url Rewrite grid-->
83-
<amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
84-
<waitForPageLoad stepKey="waitForUrlRewritePageTopLoad"/>
85-
<click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>
86-
<fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillRequestPath"/>
87-
<click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
88-
<waitForPageLoad stepKey="waitForPageToLoad1"/>
89-
<see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="seeEmptyRow"/>
76+
<actionGroup ref="AdminSearchDeletedUrlRewriteActionGroup" stepKey="searchingCategoryUrlRewrite">
77+
<argument name="requestPath" value="{{SimpleRootSubCategory.url_key}}"/>
78+
</actionGroup>
9079
</test>
9180
</tests>

0 commit comments

Comments
 (0)