Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactoring admin update category name with store view test #28631

Merged
merged 3 commits into from
Jun 12, 2020
Merged

Refactoring admin update category name with store view test #28631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
838b774
Refactoring the test
kate-kyzyma Jun 3, 2020
740408d
Refactoring the test
kate-kyzyma Jun 3, 2020
a043dcc
Merge branch '2.4-develop' into Refactoring-AdminUpdateCategoryNameWi…
kate-kyzyma Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeCategoryNameActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminChangeCategoryNameActionGroup">
<annotations>
<description>Switch the Storefront to the provided Store.</description>
</annotations>
<arguments>
<argument name="categoryName" type="string" defaultValue="{{_defaultCategory.name}}"/>
</arguments>
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{categoryName}}" stepKey="updateCategoryName"/>
</actionGroup>
</actionGroups>
22 changes: 22 additions & 0 deletions ...Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsNotShownInMenuActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup">
<annotations>
<description>Validate that the Category is not present in menu on Frontend.</description>
</annotations>
<arguments>
<argument name="categoryName" type="string"/>
</arguments>

<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
stepKey="doNotSeeCatergoryInStoreFront"/>
</actionGroup>
</actionGroups>
22 changes: 22 additions & 0 deletions ...to/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontAssertCategoryNameIsShownInMenuActionGroup">
<annotations>
<description>Validate that the Category is present in menu on Frontend.</description>
</annotations>
<arguments>
<argument name="categoryName" type="string"/>
</arguments>

<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
stepKey="seeCatergoryInStoreFront"/>
</actionGroup>
</actionGroups>
60 changes: 32 additions & 28 deletions app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryNameWithStoreViewTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,12 @@
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>

<!--Open store page -->
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
<waitForPageLoad stepKey="waitForSystemStorePage"/>

<!--Create Custom Store -->
<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
<selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
<actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
<argument name="website" value="{{_defaultWebsite.name}}"/>
<argument name="store" value="{{customStore.name}}"/>
<argument name="rootCategory" value="$$rootCategory.name$$"/>
</actionGroup>

<!--Create Store View-->
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
Expand All @@ -50,32 +46,40 @@
</actionGroup>

<!--Verify created SubCAtegory is present on Store Front -->
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
<waitForPageLoad stepKey="waitForPageToLoad"/>
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
<actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="seeCustomStore">
<argument name="storeName" value="{{customStore.name}}"/>
</actionGroup>
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryPage">
<argument name="categoryName" value="$$category.name$$"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
<argument name="categoryName" value="$$category.name$$"/>
</actionGroup>

<!--Open Category Page-->
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>

<!--Update Category-->
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
<click selector="{{AdminCategorySidebarTreeSection.categoryInTreeUnderRoot(SimpleRootSubCategory.name)}}" stepKey="clickOnSubcategoryIsUndeRootCategory"/>
<waitForPageLoad stepKey="waitForPageToLoad1"/>
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
<waitForPageLoad stepKey="waitForCateforyToSave"/>
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandCategoryTree"/>
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
<argument name="category" value="$$category$$"/>
</actionGroup>
<actionGroup ref="AdminChangeCategoryNameActionGroup" stepKey="updateCategoryName"/>
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>

<!--Verify the Category is not present in Store Front-->
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
<waitForPageLoad stepKey="waitForPageToLoaded2"/>
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="dontSeeCatergoryInStoreFront"/>
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
<argument name="categoryName" value="{{_defaultCategory.name}}"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeOldCategoryNameInStoreFront">
<argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
</actionGroup>

<!--Verify the Updated Category is present in Store Front-->
<amOnPage url="/{{NewRootCategory.name}}/{{_defaultCategory.name}}.html" stepKey="seeTheUpdatedCategoryInStoreFront"/>
<waitForPageLoad stepKey="waitForPageToLoaded3"/>
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeUpdatedCatergoryInStoreFront"/>
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeUpdatedCatergoryNameInStoreFront">
<argument name="categoryName" value="{{_defaultCategory.name}}"/>
</actionGroup>
</test>
</tests>
21 changes: 21 additions & 0 deletions app/code/Magento/Store/Test/Mftf/ActionGroup/StorefrontSwitchStoreActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="StorefrontSwitchStoreActionGroup">
<annotations>
<description>Switch the Storefront to the provided Store.</description>
</annotations>
<arguments>
<argument name="storeName" type="string"/>
</arguments>
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickOnSwitchStoreButton"/>
<click selector="{{StorefrontFooterSection.storeLink(storeName)}}" stepKey="selectStoreToSwitchOn"/>
</actionGroup>
</actionGroups>