Skip to content

Commit 867fee7

Browse files
magento-mts-svcmagento-mts-svc
authored
merge magento/2.4.0-develop into magento-mpi/MC-32962
2 parents 7b2f826 + dc9b5a9 commit 867fee7

17 files changed

+365
-192
lines changed

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

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,72 +14,55 @@
1414
<title value="Admin should be able to mass update product statuses in store view scope"/>
1515
<description value="Admin should be able to mass update product statuses in store view scope"/>
1616
<severity value="AVERAGE"/>
17-
<testCaseId value="MAGETWO-59361"/>
17+
<testCaseId value="MC-28538"/>
1818
<group value="Catalog"/>
1919
<group value="Product Attributes"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
2222
<before>
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424

25-
<!--Create Website -->
2625
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
27-
<argument name="newWebsiteName" value="Second Website"/>
28-
<argument name="websiteCode" value="second_website"/>
26+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
27+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
2928
</actionGroup>
30-
31-
<!--Create Store -->
3229
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
33-
<argument name="website" value="Second Website"/>
34-
<argument name="storeGroupName" value="Second Store"/>
35-
<argument name="storeGroupCode" value="second_store"/>
30+
<argument name="website" value="{{customWebsite.name}}"/>
31+
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
32+
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
33+
</actionGroup>
34+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
35+
<argument name="StoreGroup" value="customStoreGroup"/>
36+
<argument name="customStore" value="customStore"/>
3637
</actionGroup>
37-
38-
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
41-
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
42-
<waitForPageLoad stepKey="waitForProductPageLoad"/>
43-
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
44-
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
45-
<fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
46-
<fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
47-
<selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
48-
<click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView"/>
49-
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal"/>
50-
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning"/>
51-
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal"/>
52-
<waitForPageLoad stepKey="waitForPageLoad2" time="180"/>
53-
<waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
54-
<see userInput="You saved the store view." stepKey="seeSavedMessage"/>
5538

5639
<!--Create a Simple Product 1 -->
5740
<actionGroup ref="CreateSimpleProductAndAddToWebsiteActionGroup" stepKey="createSimpleProduct1">
5841
<argument name="product" value="simpleProductForMassUpdate"/>
59-
<argument name="website" value="Second Website"/>
42+
<argument name="website" value="{{customWebsite.name}}"/>
6043
</actionGroup>
6144

6245
<!--Create a Simple Product 2 -->
6346
<actionGroup ref="CreateSimpleProductAndAddToWebsiteActionGroup" stepKey="createSimpleProduct2">
6447
<argument name="product" value="simpleProductForMassUpdate2"/>
65-
<argument name="website" value="Second Website"/>
48+
<argument name="website" value="{{customWebsite.name}}"/>
6649
</actionGroup>
6750
</before>
6851
<after>
6952
<!--Delete website -->
7053
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
71-
<argument name="websiteName" value="Second Website"/>
54+
<argument name="websiteName" value="{{customWebsite.name}}"/>
7255
</actionGroup>
73-
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
56+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
7457

7558
<!--Delete Products -->
76-
<actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
77-
<argument name="productName" value="simpleProductForMassUpdate.name"/>
59+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct1">
60+
<argument name="sku" value="{{simpleProductForMassUpdate.sku}}"/>
7861
</actionGroup>
79-
<actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
80-
<argument name="productName" value="simpleProductForMassUpdate2.name"/>
62+
<actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct2">
63+
<argument name="sku" value="{{simpleProductForMassUpdate2.sku}}"/>
8164
</actionGroup>
82-
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
65+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
8366
</after>
8467

8568
<!-- Search and select products -->
@@ -92,7 +75,7 @@
9275

9376
<!-- Filter to Second Store View -->
9477
<actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterStoreView">
95-
<argument name="customStore" value="'Second Store View'"/>
78+
<argument name="customStore" value="customStore.name"/>
9679
</actionGroup>
9780

9881
<!-- Select Product 2 -->

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

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,41 +15,35 @@
1515
<title value="Use Default Value checkboxes should be checked for new website scope"/>
1616
<description value="Use Default Value checkboxes for product attribute should be checked for new website scope"/>
1717
<severity value="BLOCKER"/>
18-
<testCaseId value="MAGETWO-92454"/>
18+
<testCaseId value="MC-25783"/>
1919
<group value="Catalog"/>
2020
</annotations>
21+
22+
<before>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
25+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
26+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
27+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
28+
</actionGroup>
29+
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
30+
<argument name="website" value="{{customWebsite.name}}"/>
31+
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
32+
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
33+
</actionGroup>
34+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
35+
<argument name="StoreGroup" value="customStoreGroup"/>
36+
<argument name="customStore" value="customStore"/>
37+
</actionGroup>
38+
</before>
39+
2140
<after>
2241
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
23-
<argument name="websiteName" value="Second Website"/>
42+
<argument name="websiteName" value="{{customWebsite.name}}"/>
2443
</actionGroup>
44+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
2545
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
2646
</after>
27-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
28-
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
29-
<argument name="newWebsiteName" value="Second Website"/>
30-
<argument name="websiteCode" value="second_website"/>
31-
</actionGroup>
32-
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
33-
<argument name="website" value="Second Website"/>
34-
<argument name="storeGroupName" value="Second Store"/>
35-
<argument name="storeGroupCode" value="second_store"/>
36-
</actionGroup>
37-
38-
<!--Create Store view -->
39-
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
40-
<waitForPageLoad stepKey="waitForSystemStorePage"/>
41-
<click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
42-
<waitForPageLoad stepKey="waitForProductPageLoad"/>
43-
<waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
44-
<selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
45-
<fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
46-
<fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
47-
<selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
48-
<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
49-
<waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
50-
<conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
51-
<waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
52-
<see userInput="You saved the store view." stepKey="seeSaveMessage"/>
5347

5448
<!--Create a Simple Product -->
5549
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
@@ -63,17 +57,17 @@
6357

6458
<!-- Add product to second website and save the product -->
6559
<click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
66-
<click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
60+
<click selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectSecondWebsite"/>
6761
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
6862
<waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
6963
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
7064

7165
<!-- switch to the second store view -->
7266
<click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
73-
<click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/>
67+
<click selector="{{AdminProductFormActionSection.selectStoreView(customStore.name)}}" stepKey="chooseStoreView"/>
7468
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
7569
<waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
76-
<see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
70+
<see userInput="{{customStore.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
7771

7872
<!-- Check if Use Default Value checkboxes are checked -->
7973
<seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="seeProductStatusCheckboxChecked"/>

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,42 +26,42 @@
2626
<requiredEntity createDataKey="category"/>
2727
</createData>
2828
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
29-
<argument name="newWebsiteName" value="FirstWebSite"/>
30-
<argument name="websiteCode" value="FirstWebSiteCode"/>
29+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
30+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
3131
</actionGroup>
3232
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore" after="createWebsite">
33-
<argument name="website" value="FirstWebSite"/>
34-
<argument name="storeGroupName" value="NewStore"/>
35-
<argument name="storeGroupCode" value="Base1"/>
33+
<argument name="website" value="{{customWebsite.name}}"/>
34+
<argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
35+
<argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
3636
</actionGroup>
3737
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView" after="createNewStore">
38-
<argument name="StoreGroup" value="staticFirstStoreGroup"/>
39-
<argument name="customStore" value="staticStore"/>
38+
<argument name="StoreGroup" value="customStoreGroup"/>
39+
<argument name="customStore" value="customStore"/>
4040
</actionGroup>
4141

4242
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite" after="createCustomStoreView">
43-
<argument name="newWebsiteName" value="SecondWebSite"/>
44-
<argument name="websiteCode" value="SecondWebSiteCode"/>
43+
<argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
44+
<argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
4545
</actionGroup>
4646
<actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore" after="createSecondWebsite">
47-
<argument name="website" value="SecondWebSite"/>
48-
<argument name="storeGroupName" value="SecondStore"/>
49-
<argument name="storeGroupCode" value="Base2"/>
47+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
48+
<argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
49+
<argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
5050
</actionGroup>
5151
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView2" after="createSecondStore">
52-
<argument name="StoreGroup" value="staticStoreGroup"/>
53-
<argument name="customStore" value="staticSecondStore"/>
52+
<argument name="StoreGroup" value="SecondStoreGroupUnique"/>
53+
<argument name="customStore" value="SecondStoreUnique"/>
5454
</actionGroup>
5555
</before>
5656

5757
<after>
5858
<actionGroup ref="ResetWebUrlOptionsActionGroup" stepKey="resetUrlOption"/>
5959
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
60-
<argument name="websiteName" value="FirstWebSite"/>
60+
<argument name="websiteName" value="{{customWebsite.name}}"/>
6161
</actionGroup>
6262

6363
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
64-
<argument name="websiteName" value="SecondWebSite"/>
64+
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
6565
</actionGroup>
6666
<deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
6767
<deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
@@ -90,10 +90,10 @@
9090
</actionGroup>
9191
<!--"Product in Websites": select both Websites-->
9292
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite1">
93-
<argument name="website" value="FirstWebSite"/>
93+
<argument name="website" value="{{customWebsite.name}}"/>
9494
</actionGroup>
9595
<actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite2">
96-
<argument name="website" value="SecondWebSite"/>
96+
<argument name="website" value="{{secondCustomWebsite.name}}"/>
9797
</actionGroup>
9898

9999
<!--Go to "Catalog" -> "Products". Open created product-->
@@ -110,7 +110,7 @@
110110

111111
<!--Switch to "Store view 1"-->
112112
<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="selectStoreView">
113-
<argument name="storeViewName" value="Store View"/>
113+
<argument name="storeViewName" value="{{customStore.name}}"/>
114114
</actionGroup>
115115

116116
<!-- Assert product first image not in admin product form -->
@@ -120,7 +120,7 @@
120120

121121
<!--Switch to "Store view 2"-->
122122
<actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="selectSecondStoreView">
123-
<argument name="storeViewName" value="Second Store View"/>
123+
<argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
124124
</actionGroup>
125125

126126
<!-- Verify that Image 1 is deleted from the Second Store View list -->

0 commit comments

Comments
 (0)