Skip to content

Commit 9fac520

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-30720' into 2.4-develop-pr11
2 parents 293cd41 + fda86a8 commit 9fac520

File tree

1 file changed

+50
-45
lines changed

1 file changed

+50
-45
lines changed

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

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414
<title value="Admin should be able to move a category via categories tree and changes should be applied on frontend without a forced cache cleaning"/>
1515
<description value="Admin should be able to move a category via categories tree and changes should be applied on frontend without a forced cache cleaning"/>
1616
<severity value="CRITICAL"/>
17-
<testCaseId value="MAGETWO-76273"/>
17+
<testCaseId value="MC-10022"/>
18+
<useCaseId value="MAGETWO-89248"/>
1819
<group value="category"/>
19-
<skip>
20-
<issueId value="MC-30720"/>
21-
</skip>
2220
</annotations>
2321
<before>
2422
<createData entity="SimpleSubCategory" stepKey="simpleSubCategoryOne"/>
@@ -32,95 +30,102 @@
3230
<createData entity="_defaultProduct" stepKey="productTwo">
3331
<requiredEntity createDataKey="simpleSubCategoryOne"/>
3432
</createData>
35-
<magentoCLI command="cron:run --group=index" stepKey="runIndexerCron"/>
33+
34+
<!-- TODO: Replace this with CliRunReindexUsingCronJobsActionGroup after MC-29943 delivered-->
35+
<magentoCLI command="cron:run" arguments="--group='index'" stepKey="firstRunToScheduleJobs"/>
36+
<magentoCLI command="cron:run" arguments="--group='index'" stepKey="secondRunToExecuteJobs"/>
37+
38+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3639
</before>
40+
3741
<after>
38-
<actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
3942
<deleteData createDataKey="productOne" stepKey="deleteProductOne"/>
4043
<deleteData createDataKey="productTwo" stepKey="deleteProductTwo"/>
4144
<deleteData createDataKey="simpleSubCategoryWithParent" stepKey="deleteSubcategoryWithParent"/>
45+
<deleteData createDataKey="simpleSubCategoryOne" stepKey="deleteSubcategoryOne"/>
4246
<deleteData createDataKey="simpleSubCategoryTwo" stepKey="deleteSubcategoryTwo"/>
47+
<actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
4348
</after>
49+
4450
<!--Move category one to category two-->
45-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
4651
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage"/>
4752
<waitForPageLoad stepKey="waitForAdminCategoryPageLoad1"/>
4853
<actionGroup ref="MoveCategoryActionGroup" stepKey="moveSimpleSubCategoryOneToSimpleSubCategoryTwo">
49-
<argument name="childCategory" value="$$simpleSubCategoryOne.name$$"/>
50-
<argument name="parentCategory" value="$$simpleSubCategoryTwo.name$$"/>
54+
<argument name="childCategory" value="$simpleSubCategoryOne.name$"/>
55+
<argument name="parentCategory" value="$simpleSubCategoryTwo.name$"/>
5156
</actionGroup>
5257
<!--Verify that navigation menu categories level is correct-->
53-
<amOnPage url="/" stepKey="amOnStorefrontPage1"/>
58+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage1"/>
5459
<waitForPageLoad stepKey="waitForPageToLoadAfterHomePageOpened1"/>
55-
<seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="verifyThatTopCategoryIsSubCategoryTwo"/>
56-
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="mouseOverSubCategoryTwo"/>
60+
<seeElement selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryTwo.name$)}}" stepKey="verifyThatTopCategoryIsSubCategoryTwo"/>
61+
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryTwo.name$)}}" stepKey="mouseOverSubCategoryTwo"/>
5762
<waitForAjaxLoad stepKey="waitForAjaxOnMouseOverSubCategoryTwo"/>
58-
<seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="verifyThatFirstLevelIsSubCategoryOne"/>
59-
<moveMouseOver selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="mouseOverSubCategoryOne"/>
63+
<seeElement selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryOne.name$)}}" stepKey="verifyThatFirstLevelIsSubCategoryOne"/>
64+
<moveMouseOver selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryOne.name$)}}" stepKey="mouseOverSubCategoryOne"/>
6065
<waitForAjaxLoad stepKey="waitForAjaxOnMouseOverSubCategoryOne"/>
61-
<seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryWithParent.name$$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent1"/>
66+
<seeElement selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryWithParent.name$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent1"/>
6267
<!--Open category one via navigation menu. Verify that subcategory is shown in layered navigation-->
63-
<click selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu1"/>
68+
<click selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryOne.name$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu1"/>
6469
<actionGroup ref="CheckItemInLayeredNavigationActionGroup" stepKey="verifySimpleSubCategoryWithParentInLayeredNavigation1">
6570
<argument name="itemType" value="Category"/>
66-
<argument name="itemName" value="$$simpleSubCategoryWithParent.name$$"/>
71+
<argument name="itemName" value="$simpleSubCategoryWithParent.name$"/>
6772
</actionGroup>
6873
<!--Open category one by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
6974
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage1">
70-
<argument name="category" value="$$simpleSubCategoryOne$$"/>
71-
<argument name="product" value="$$productOne$$"/>
75+
<argument name="category" value="$simpleSubCategoryOne$"/>
76+
<argument name="product" value="$productOne$"/>
7277
</actionGroup>
7378
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs1"/>
74-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryTwo.name$$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryOne"/>
75-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne1"/>
76-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne1"/>
79+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryTwo.name$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryOne"/>
80+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne1"/>
81+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne1"/>
7782
<!--Open category two by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
7883
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryWithParentCategoryPage">
79-
<argument name="category" value="$$simpleSubCategoryWithParent$$"/>
80-
<argument name="product" value="$$productOne$$"/>
84+
<argument name="category" value="$simpleSubCategoryWithParent$"/>
85+
<argument name="product" value="$productOne$"/>
8186
</actionGroup>
8287
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbsOnSubCategoryWithParent"/>
83-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryTwo.name$$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryWithParent"/>
84-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryWithParent"/>
85-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent"/>
86-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryWithParent"/>
88+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryTwo.name$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryWithParent"/>
89+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryWithParent"/>
90+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent"/>
91+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryWithParent"/>
8792
<!--Move category one to the same level as category two-->
8893
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage2"/>
8994
<waitForPageLoad stepKey="waitForAdminCategoryPageLoad2"/>
9095
<actionGroup ref="MoveCategoryActionGroup" stepKey="moveSimpleSubCategoryOneToDefaultCategory">
91-
<argument name="childCategory" value="$$simpleSubCategoryOne.name$$"/>
96+
<argument name="childCategory" value="$simpleSubCategoryOne.name$"/>
9297
<argument name="parentCategory" value="Default Category"/>
9398
</actionGroup>
9499
<!--Verify that navigation menu categories level is correct-->
95-
<amOnPage url="/" stepKey="amOnStorefrontPage2"/>
100+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage2"/>
96101
<waitForPageLoad stepKey="waitForPageToLoadAfterHomePageOpened2"/>
97-
<seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="verifyThatSubCategoryOneIsTopCategory"/>
98-
<seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="verifyThatSubCategoryTwoIsTopCategory"/>
99-
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="mouseOverTopSubCategoryOne"/>
102+
<seeElement selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryOne.name$)}}" stepKey="verifyThatSubCategoryOneIsTopCategory"/>
103+
<seeElement selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryTwo.name$)}}" stepKey="verifyThatSubCategoryTwoIsTopCategory"/>
104+
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryOne.name$)}}" stepKey="mouseOverTopSubCategoryOne"/>
100105
<waitForAjaxLoad stepKey="waitForAjaxOnMouseOverTopSubCategoryOne"/>
101-
<seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryWithParent.name$$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent2"/>
106+
<seeElement selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryWithParent.name$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent2"/>
102107
<!--Open category one via navigation menu. Verify that subcategory is shown in layered navigation-->
103-
<click selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu2"/>
108+
<click selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryOne.name$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu2"/>
104109
<actionGroup ref="CheckItemInLayeredNavigationActionGroup" stepKey="verifySimpleSubCategoryWithParentInLayeredNavigation2">
105110
<argument name="itemType" value="Category"/>
106-
<argument name="itemName" value="$$simpleSubCategoryWithParent.name$$"/>
111+
<argument name="itemName" value="$simpleSubCategoryWithParent.name$"/>
107112
</actionGroup>
108113
<!--Open category one by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
109114
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage2">
110-
<argument name="category" value="$$simpleSubCategoryOne$$"/>
111-
<argument name="product" value="$$productOne$$"/>
115+
<argument name="category" value="$simpleSubCategoryOne$"/>
116+
<argument name="product" value="$productOne$"/>
112117
</actionGroup>
113118
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs2"/>
114-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne2"/>
115-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne2"/>
119+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne2"/>
120+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne2"/>
116121
<!--Open category subcategory by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
117122
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage3">
118-
<argument name="category" value="$$simpleSubCategoryWithParent$$"/>
119-
<argument name="product" value="$$productOne$$"/>
123+
<argument name="category" value="$simpleSubCategoryWithParent$"/>
124+
<argument name="product" value="$productOne$"/>
120125
</actionGroup>
121126
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="Home" stepKey="seeHomePageInBreadcrumbs3"/>
122-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne3"/>
123-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$simpleSubCategoryOne.name$$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent3"/>
124-
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$$productOne.name$$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne3"/>
127+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne3"/>
128+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent3"/>
129+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne3"/>
125130
</test>
126131
</tests>

0 commit comments

Comments
 (0)