Skip to content

Commit 7e54c0b

Browse files
zakdmazakdma
committed
MC-30720: [MFTF] [2.4] Fix flaky test AdminMoveAnchoredCategoryTest (MAGETWO-76273)
1 parent 90a479f commit 7e54c0b

File tree

1 file changed

+47
-44
lines changed

1 file changed

+47
-44
lines changed

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

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MAGETWO-76273"/>
1818
<group value="category"/>
19-
<skip>
20-
<issueId value="MC-30720"/>
21-
</skip>
2219
</annotations>
2320
<before>
2421
<createData entity="SimpleSubCategory" stepKey="simpleSubCategoryOne"/>
@@ -32,95 +29,101 @@
3229
<createData entity="_defaultProduct" stepKey="productTwo">
3330
<requiredEntity createDataKey="simpleSubCategoryOne"/>
3431
</createData>
35-
<magentoCLI command="cron:run --group=index" stepKey="runIndexerCron"/>
32+
33+
<!-- TODO: Replace this with CliRunReindexUsingCronJobsActionGroup after MC-29943 delivered-->
34+
<magentoCLI command="cron:run" arguments="--group='index'" stepKey="firstRunToScheduleJobs"/>
35+
<magentoCLI command="cron:run" arguments="--group='index'" stepKey="secondRunToExecuteJobs"/>
36+
37+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
3638
</before>
39+
3740
<after>
38-
<actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
3941
<deleteData createDataKey="productOne" stepKey="deleteProductOne"/>
4042
<deleteData createDataKey="productTwo" stepKey="deleteProductTwo"/>
4143
<deleteData createDataKey="simpleSubCategoryWithParent" stepKey="deleteSubcategoryWithParent"/>
4244
<deleteData createDataKey="simpleSubCategoryTwo" stepKey="deleteSubcategoryTwo"/>
45+
<actionGroup ref="logout" stepKey="logoutAdminUserAfterTest"/>
4346
</after>
47+
4448
<!--Move category one to category two-->
45-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
4649
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage"/>
4750
<waitForPageLoad stepKey="waitForAdminCategoryPageLoad1"/>
4851
<actionGroup ref="MoveCategoryActionGroup" stepKey="moveSimpleSubCategoryOneToSimpleSubCategoryTwo">
49-
<argument name="childCategory" value="$$simpleSubCategoryOne.name$$"/>
50-
<argument name="parentCategory" value="$$simpleSubCategoryTwo.name$$"/>
52+
<argument name="childCategory" value="$simpleSubCategoryOne.name$"/>
53+
<argument name="parentCategory" value="$simpleSubCategoryTwo.name$"/>
5154
</actionGroup>
5255
<!--Verify that navigation menu categories level is correct-->
53-
<amOnPage url="/" stepKey="amOnStorefrontPage1"/>
56+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="openHomePageFirst"/>
5457
<waitForPageLoad stepKey="waitForPageToLoadAfterHomePageOpened1"/>
55-
<seeElement selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="verifyThatTopCategoryIsSubCategoryTwo"/>
56-
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryTwo.name$$)}}" stepKey="mouseOverSubCategoryTwo"/>
58+
<seeElement selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryTwo.name$)}}" stepKey="verifyThatTopCategoryIsSubCategoryTwo"/>
59+
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryTwo.name$)}}" stepKey="mouseOverSubCategoryTwo"/>
5760
<waitForAjaxLoad stepKey="waitForAjaxOnMouseOverSubCategoryTwo"/>
58-
<seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="verifyThatFirstLevelIsSubCategoryOne"/>
59-
<moveMouseOver selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="mouseOverSubCategoryOne"/>
61+
<seeElement selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryOne.name$)}}" stepKey="verifyThatFirstLevelIsSubCategoryOne"/>
62+
<moveMouseOver selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryOne.name$)}}" stepKey="mouseOverSubCategoryOne"/>
6063
<waitForAjaxLoad stepKey="waitForAjaxOnMouseOverSubCategoryOne"/>
61-
<seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryWithParent.name$$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent1"/>
64+
<seeElement selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryWithParent.name$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent1"/>
6265
<!--Open category one via navigation menu. Verify that subcategory is shown in layered navigation-->
63-
<click selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryOne.name$$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu1"/>
66+
<click selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryOne.name$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu1"/>
6467
<actionGroup ref="CheckItemInLayeredNavigationActionGroup" stepKey="verifySimpleSubCategoryWithParentInLayeredNavigation1">
6568
<argument name="itemType" value="Category"/>
66-
<argument name="itemName" value="$$simpleSubCategoryWithParent.name$$"/>
69+
<argument name="itemName" value="$simpleSubCategoryWithParent.name$"/>
6770
</actionGroup>
6871
<!--Open category one by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
6972
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage1">
70-
<argument name="category" value="$$simpleSubCategoryOne$$"/>
71-
<argument name="product" value="$$productOne$$"/>
73+
<argument name="category" value="$simpleSubCategoryOne$"/>
74+
<argument name="product" value="$productOne$"/>
7275
</actionGroup>
7376
<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"/>
77+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryTwo.name$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryOne"/>
78+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne1"/>
79+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne1"/>
7780
<!--Open category two by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
7881
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryWithParentCategoryPage">
79-
<argument name="category" value="$$simpleSubCategoryWithParent$$"/>
80-
<argument name="product" value="$$productOne$$"/>
82+
<argument name="category" value="$simpleSubCategoryWithParent$"/>
83+
<argument name="product" value="$productOne$"/>
8184
</actionGroup>
8285
<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"/>
86+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryTwo.name$" stepKey="seeSubCategoryTwoInBreadcrumbsOnSubCategoryWithParent"/>
87+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryWithParent"/>
88+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent"/>
89+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryWithParent"/>
8790
<!--Move category one to the same level as category two-->
8891
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToAdminCategoryPage2"/>
8992
<waitForPageLoad stepKey="waitForAdminCategoryPageLoad2"/>
9093
<actionGroup ref="MoveCategoryActionGroup" stepKey="moveSimpleSubCategoryOneToDefaultCategory">
91-
<argument name="childCategory" value="$$simpleSubCategoryOne.name$$"/>
94+
<argument name="childCategory" value="$simpleSubCategoryOne.name$"/>
9295
<argument name="parentCategory" value="Default Category"/>
9396
</actionGroup>
9497
<!--Verify that navigation menu categories level is correct-->
95-
<amOnPage url="/" stepKey="amOnStorefrontPage2"/>
98+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="openHomePageSecond"/>
9699
<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"/>
100+
<seeElement selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryOne.name$)}}" stepKey="verifyThatSubCategoryOneIsTopCategory"/>
101+
<seeElement selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryTwo.name$)}}" stepKey="verifyThatSubCategoryTwoIsTopCategory"/>
102+
<moveMouseOver selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryOne.name$)}}" stepKey="mouseOverTopSubCategoryOne"/>
100103
<waitForAjaxLoad stepKey="waitForAjaxOnMouseOverTopSubCategoryOne"/>
101-
<seeElement selector="{{StorefrontNavigationSection.subCategory($$simpleSubCategoryWithParent.name$$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent2"/>
104+
<seeElement selector="{{StorefrontNavigationSection.subCategory($simpleSubCategoryWithParent.name$)}}" stepKey="verifyThatSecondLevelIsSubCategoryWithParent2"/>
102105
<!--Open category one via navigation menu. Verify that subcategory is shown in layered navigation-->
103-
<click selector="{{StorefrontNavigationSection.topCategory($$simpleSubCategoryOne.name$$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu2"/>
106+
<click selector="{{StorefrontNavigationSection.topCategory($simpleSubCategoryOne.name$)}}" stepKey="openSimpleSubCategoryOneByNavigationMenu2"/>
104107
<actionGroup ref="CheckItemInLayeredNavigationActionGroup" stepKey="verifySimpleSubCategoryWithParentInLayeredNavigation2">
105108
<argument name="itemType" value="Category"/>
106-
<argument name="itemName" value="$$simpleSubCategoryWithParent.name$$"/>
109+
<argument name="itemName" value="$simpleSubCategoryWithParent.name$"/>
107110
</actionGroup>
108111
<!--Open category one by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
109112
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage2">
110-
<argument name="category" value="$$simpleSubCategoryOne$$"/>
111-
<argument name="product" value="$$productOne$$"/>
113+
<argument name="category" value="$simpleSubCategoryOne$"/>
114+
<argument name="product" value="$productOne$"/>
112115
</actionGroup>
113116
<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"/>
117+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne2"/>
118+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne2"/>
116119
<!--Open category subcategory by direct URL. Verify simple product is visible on it. Open this product and perform assertions-->
117120
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openFirstProductFromSubCategoryOneCategoryPage3">
118-
<argument name="category" value="$$simpleSubCategoryWithParent$$"/>
119-
<argument name="product" value="$$productOne$$"/>
121+
<argument name="category" value="$simpleSubCategoryWithParent$"/>
122+
<argument name="product" value="$productOne$"/>
120123
</actionGroup>
121124
<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"/>
125+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryOneInBreadcrumbsOnSubCategoryOne3"/>
126+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$simpleSubCategoryOne.name$" stepKey="seeSubCategoryWithParentInBreadcrumbsOnSubCategoryWithParent3"/>
127+
<see selector="{{StorefrontNavigationSection.breadcrumbs}}" userInput="$productOne.name$" stepKey="seeProductInBreadcrumbsOnSubCategoryOne3"/>
125128
</test>
126129
</tests>

0 commit comments

Comments
 (0)