Skip to content

Commit

Permalink
Merge branch '2.4-develop' of github.com:magento/magento2 into 28569_…
Browse files Browse the repository at this point in the history 
…adding_stores_to_store_config
  • Loading branch information
@gallyamov
gallyamov committed Jun 25, 2020
2 parents 4fe5f8f + def5104 commit 48f8add
Show file tree
Hide file tree
Showing 14 changed files with 378 additions and 177 deletions.
4 changes: 4 additions & 0 deletions app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ public function execute()
unset($data['apply_to']);
}

if ($model->getBackendType() == 'static' && !$model->getIsUserDefined()) {
$data['frontend_class'] = $model->getFrontendClass();
}

$model->addData($data);

if (!$attributeId) {
Expand Down
17 changes: 17 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminEnableCategoryActionGroup.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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="AdminEnableCategoryActionGroup">
<annotations>
<description>Enable the category</description>
</annotations>
<click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="enableCategory"/>
</actionGroup>
</actionGroups>
17 changes: 17 additions & 0 deletions .../Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsListedInCategoriesTreeActionGroup.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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="AssertAdminCategoryIsListedInCategoriesTreeActionGroup">
<arguments>
<argument name="categoryName" type="string"/>
</arguments>
<seeElement selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="seeCategoryInTree"/>
</actionGroup>
</actionGroups>
17 changes: 17 additions & 0 deletions ...talog/Test/Mftf/ActionGroup/AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?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="AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup">
<arguments>
<argument name="categoryName" type="string"/>
</arguments>
<dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="doNotSeeCategoryInTree"/>
</actionGroup>
</actionGroups>
21 changes: 21 additions & 0 deletions app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSwitchStoreActionGroup.xml
View file
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>
28 changes: 13 additions & 15 deletions .../Magento/Catalog/Test/Mftf/Test/AdminCheckSubCategoryIsNotVisibleInNavigationMenuTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,19 @@
<!--Open Category Page-->
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
<!--Create subcategory under parent category -->
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
<waitForPageLoad stepKey="waitForCategoryToLoad"/>
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
<waitForPageLoad stepKey="waitForPageToLoad"/>
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openCreatedCategory">
<argument name="Category" value="$$createCategory$$"/>
</actionGroup>
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory">
<argument name="categoryEntity" value="SimpleSubCategory"/>
</actionGroup>
<!-- Verify Parent Category is visible in navigation menu and Sub category is not visible in navigation menu -->
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
<waitForPageLoad stepKey="waitForCategoryStoreFrontPageToLoad"/>
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryOnStoreNavigationBar"/>
<dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigation"/>
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCategoryOnStoreNavigationBar">
<argument name="categoryName" value="$$createCategory.name$$"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeSubCategoryOnStoreNavigation">
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
</actionGroup>
</test>
</tests>
51 changes: 21 additions & 30 deletions app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithCustomRootCategoryTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
</before>
<after>
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
<waitForPageLoad stepKey="waitStoreIndexPageLoad" />
<actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
<argument name="storeGroupName" value="customStore.name"/>
<argument name="storeGroupName" value="customStoreGroup.name"/>
</actionGroup>
<actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCreatedNewRootCategory">
<argument name="categoryEntity" value="NewRootCategory"/>
Expand All @@ -37,39 +35,32 @@
<argument name="categoryEntity" value="NewRootCategory"/>
</actionGroup>
<!--Create subcategory-->
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name)}}" stepKey="clickOnCreatedNewRootCategory"/>
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
<actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openCreatedCategory">
<argument name="Category" value="NewRootCategory"/>
</actionGroup>

<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory">
<argument name="categoryEntity" value="SimpleSubCategory"/>
</actionGroup>
<!--Create a Store-->
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
<waitForPageLoad stepKey="waitForSystemStorePage"/>
<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="{{customStoreGroup.name}}"/>
<argument name="rootCategory" value="{{NewRootCategory.name}}"/>
</actionGroup>
<!--Create a Store View-->
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
<click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
<selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
<selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
<waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
<argument name="StoreGroup" value="customStoreGroup"/>
<argument name="customStore" value="customStore"/>
</actionGroup>
<!--Go to store front page-->
<amOnPage url="/{{NewRootCategory.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
<waitForPageLoad time="60" stepKey="waitForStoreFrontPageLoad"/>
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
<!--Verify subcategory displayed in store front page-->
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectCustomStore"/>
<waitForPageLoad stepKey="waitForCategoryToLoad"/>
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeSubCategoryInStoreFrontPage"/>
<actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="switchToCustomStore">
<argument name="storeName" value="{{customStoreGroup.name}}"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryNameInStoreFront">
<argument name="categoryName" value="{{SimpleSubCategory.name}}"/>
</actionGroup>
</test>
</tests>
13 changes: 8 additions & 5 deletions app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,19 @@

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

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

<!--Verify Root Category is not listed in backend-->
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories1"/>
<dontSee selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{NewRootCategory.name}}" stepKey="dontSeeRootCategory"/>
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandTheCategoryTree"/>
<actionGroup ref="AssertAdminCategoryIsNotListedInCategoriesTreeActionGroup" stepKey="doNotSeeRootCategory">
<argument name="categoryName" value="{{NewRootCategory.name}}"/>
</actionGroup>
</test>
</tests>
65 changes: 27 additions & 38 deletions app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootSubCategoryTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,59 +33,48 @@
</after>

<!--Create a Store-->
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
<waitForPageLoad stepKey="waitForSystemStorePage"/>
<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"/>
<see userInput="You saved the store." stepKey="seeSaveMessage"/>
<actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
<argument name="website" value="{{_defaultWebsite.name}}"/>
<argument name="store" value="{{customStore.name}}"/>
<argument name="rootCategory" value="{{NewRootCategory.name}}"/>
</actionGroup>

<!--Create a Store View-->
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="selectCreateStoreView"/>
<click selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="clickDropDown"/>
<selectOption userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreViewStatus"/>
<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
<selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="enableStatus"/>
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreViewButton"/>
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
<waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
<see userInput="You saved the store view." stepKey="seeSaveMessage1"/>
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
<argument name="StoreGroup" value="customStore"/>
<argument name="customStore" value="customStore"/>
</actionGroup>

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

<!--Verify subcategory displayed in store front-->
<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="selectMainWebsite"/>
<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="selectMainWebsite1"/>
<waitForPageLoad stepKey="waitForCategoryToLoad"/>
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeSubCategoryInStoreFront"/>
<actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="selectCustomStore">
<argument name="storeName" value="{{customStore.name}}"/>
</actionGroup>
<actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
<argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
</actionGroup>

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

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

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

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

0 comments on commit 48f8add

Please sign in to comment.