Skip to content

Commit 88cc522

Browse files
kanairkanair
committed
MC-4381: Convert CreateCategoryEntityTest to MFTF
- updated elements and tests
1 parent d68c37c commit 88cc522

9 files changed

+70
-76
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,5 +488,6 @@
488488
<data key="status">1</data>
489489
<data key="quantity">25</data>
490490
<data key="weight">1</data>
491+
<requiredEntity type="product_extension_attribute">EavStock100</requiredEntity>
491492
</entity>
492493
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryContentSection.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<element name="description" type="input" selector="//*[@name='description']"/>
2020
<element name="content" type="button" selector="div[data-index='content'"/>
2121
<element name="categoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'no-active-category')]" parameterized="true" />
22-
<element name="CategoryPageTitle" type="text" selector="h1.page-title" />
23-
<element name="ActiveCategoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'active-category')]" parameterized="true" />
24-
<element name="ProductTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
25-
<element name="ProductTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
26-
<element name="ProductSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
22+
<element name="categoryPageTitle" type="text" selector="h1.page-title" />
23+
<element name="activeCategoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'active-category')]" parameterized="true" />
24+
<element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
25+
<element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
26+
<element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>
2727
</section>
2828
</sections>

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,21 @@
5757
<!--Search the products and select the category products-->
5858
<scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
5959
<click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
60-
<fillField selector="{{AdminCategoryContentSection.ProductTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
61-
<click selector="{{AdminCategoryContentSection.ProductSearch}}" stepKey="clickSearchButton"/>
62-
<click selector="{{AdminCategoryContentSection.ProductTableRow}}" stepKey="selectProductFromTableRow"/>
60+
<fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
61+
<click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
62+
<click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
6363
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
6464
<waitForPageLoad stepKey="waitForCategorySaved"/>
6565
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
6666
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
6767
<!--Verify the Category Title-->
68-
<see selector="{{AdminCategoryContentSection.CategoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
68+
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
6969
<!--Verify Product in store front page-->
7070
<amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name_lwr)}}" stepKey="amOnCategoryPage"/>
7171
<waitForPageLoad stepKey="waitForPageToBeLoaded"/>
7272
<see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
7373
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
74+
<waitForPageLoad stepKey="waitForProductToLoad"/>
7475
<seeElement selector="{{StorefrontCategoryMainSection.productLinkByHref($$simpleProduct.urlKey$$)}}" stepKey="seeProductInCategory"/>
7576
</test>
7677
</tests>

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
<actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
2222
</before>
2323
<after>
24+
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
25+
<waitForPageLoad stepKey="waitStoreIndexPageLoad" />
26+
<actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
27+
<argument name="storeGroupName" value="customStore.name"/>
28+
</actionGroup>
2429
<actionGroup ref="DeleteCategory" stepKey="deleteCreatedNewRootCategory">
2530
<argument name="categoryEntity" value="NewRootCategory"/>
2631
</actionGroup>
@@ -32,11 +37,10 @@
3237
<actionGroup ref="AdminCreateRootCategory" stepKey="createNewRootCategory">
3338
<argument name="categoryEntity" value="NewRootCategory"/>
3439
</actionGroup>
35-
<!--Create root category-->
40+
<!--Create subcategory-->
3641
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
3742
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name)}}" stepKey="clickOnCreatedNewRootCategory"/>
3843
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
39-
<!--Create subcategory-->
4044
<actionGroup ref="CreateCategory" stepKey="createSubcategory">
4145
<argument name="categoryEntity" value="SimpleSubCategory"/>
4246
</actionGroup>
@@ -65,19 +69,8 @@
6569
<waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
6670
<!--Verify subcategory displayed in store front page-->
6771
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
68-
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectMainWebsite1"/>
72+
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectCustomStore"/>
6973
<waitForPageLoad stepKey="waitForCategoryToLoad"/>
70-
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="SeeSubCategory"/>
71-
<!--Delete the store/-->
72-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
73-
<waitForPageLoad stepKey="waitStoreIndexPageLoad" />
74-
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
75-
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
76-
<click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickStoreViewInGrid"/>
77-
<click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreView"/>
78-
<selectOption selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" userInput="No" stepKey="dontCreateDbBackup"/>
79-
<click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreViewAgain"/>
80-
<waitForPageLoad stepKey="waitForPageToLoad"/>
81-
<see userInput="You deleted the store." stepKey="seeDeleteMessage"/>
74+
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryInStoreFrontPage"/>
8275
</test>
8376
</tests>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@
2222
<actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
2323
</before>
2424
<after>
25+
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
26+
<waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
27+
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="clickCategoryLink"/>
28+
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
29+
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
30+
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
31+
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
32+
<waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
33+
<see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
34+
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
35+
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree"/>
2536
<actionGroup ref="logout" stepKey="logout"/>
2637
</after>
2738
<!--Create Category with Five Nesting -->
@@ -71,16 +82,5 @@
7182
<expectedResult type="array">['Home', {{FirstLevelSubCat.name}}, {{SecondLevelSubCat.name}}, {{ThirdLevelSubCat.name}}, {{FourthLevelSubCat.name}}, {{FifthLevelCat.name}} ]</expectedResult>
7283
<actualResult type="variable">breadcrumbs</actualResult>
7384
</assertEquals>
74-
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="goToCategoryPage"/>
75-
<waitForPageLoad time="60" stepKey="waitForCategoryPageLoad"/>
76-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="clickCategoryLink"/>
77-
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
78-
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
79-
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>
80-
<click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
81-
<waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
82-
<see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
83-
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
84-
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree"/>
8585
</test>
8686
</tests>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
3535
<waitForPageLoad stepKey="waitForCategorySaved"/>
3636
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
37-
<see selector="{{AdminCategoryContentSection.CategoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
38-
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontSeeCheckboxEnableCategoryIsChecked"/>
39-
<!--Verify InActive Category is created/>-->
37+
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
38+
<dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
39+
<!--Verify InActive Category is created-->
4040
<seeElement selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree" />
41-
<!--Verify Category is not listed store front page/>-->
41+
<!--Verify Category is not listed store front page-->
4242
<amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="amOnCategoryPage"/>
4343
<waitForPageLoad stepKey="waitForPageToBeLoaded"/>
4444
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreFrontPage"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<waitForPageLoad stepKey="waitForCategorySaved"/>
3636
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
3737
<waitForPageLoad stepKey="waitForPageSaved"/>
38-
<see selector="{{AdminCategoryContentSection.CategoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
38+
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
3939
<!--Verify Category is created/>-->
40-
<seeElement selector="{{AdminCategoryContentSection.ActiveCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree" />
40+
<seeElement selector="{{AdminCategoryContentSection.activeCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree" />
4141
<!--Verify Category in store front page menu/>-->
4242
<amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="amOnCategoryPage"/>
4343
<waitForPageLoad stepKey="waitForPageToBeLoaded"/>

0 commit comments

Comments
 (0)