Skip to content

Commit 6f79389

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop latest changes
Accepted Community Pull Requests: - #31057: [MFTF] Refactoring of AdminMassProductPriceUpdateTest (by @AnnaAPak) - #31371: [MFTF] Refactoring AdminSortingByWebsitesTest (by @AnnaAPak) - #31009: [MFTF]: Refactoring of AdminCreateInvoiceTest (by @AnnaAPak) - #31323: [MFTF] Adding AdminClickRefundOfflineOnNewMemoPageActionGroup (by @AnnaAPak) - #31198: Issues 31197 - Loading wrong order tax info (by @srenon) - #31162: Allow to load base64 encoded images and fonts (by @vovayatsyuk) - #31436: Updating with StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup (by @AnnaAPak) - #31320: Removed CliIndexerReindexActionGroup action group usage for Catalog module (by @sergiy-v) - #31334: Fix issue with logging each cookie as separate context (by @aleksinoleg) - #31330: Update varnish 6 vcl config (by @mrtuvn) - #31308: Fix ftp_nlist for empty folders returns false (by @Nazar65) - #30776: [MFTF] Add AssertStorefrontCartDiscountActionGroup (by @Usik2203) Fixed GitHub Issues: - #31073: [Issue] [MFTF] Refactoring of AdminMassProductPriceUpdateTest (reported by @m2-assistant[bot]) has been fixed in #31057 by @AnnaAPak in 2.4-develop branch Related commits: 1. 97e3454 2. 131cd1a 3. bdb653d 4. faf0c87 5. dd4334d 6. 758b0d6 7. 52e5d2c 8. a048fb7 9. c9e2c6f 10. 6fc4191 11. 64b617f 12. 9691ef6 13. b3efee9 - #31442: [Issue] [MFTF] Refactoring AdminSortingByWebsitesTest (reported by @m2-assistant[bot]) has been fixed in #31371 by @AnnaAPak in 2.4-develop branch Related commits: 1. 2a71255 2. ec105b5 - #31036: [Issue] [MFTF]: Refactoring of AdminCreateInvoiceTest (reported by @m2-assistant[bot]) has been fixed in #31009 by @AnnaAPak in 2.4-develop branch Related commits: 1. 9ffcdc6 2. 0c14e5f 3. ea99547 4. 3e46731 5. d157d42 6. 3d5060f 7. b23cad2 8. 2d8be9c 9. ce7a351 10. 83dab7e - #31325: [Issue] [MFTF] Adding AdminClickRefundOfflineOnNewMemoPageActionGroup (reported by @m2-assistant[bot]) has been fixed in #31323 by @AnnaAPak in 2.4-develop branch Related commits: 1. 37e8487 2. 31eb859 3. 06b3b29 - #31197: Magento loading the wrong Tax info on admin Invoice and Creditmemo page (reported by @srenon) has been fixed in #31198 by @srenon in 2.4-develop branch Related commits: 1. 41c3aa2 2. 4b007c2 3. 0e58811 4. 84b1ea0 - #31170: [Issue] Allow to load base64 encoded images and fonts (reported by @m2-assistant[bot]) has been fixed in #31162 by @vovayatsyuk in 2.4-develop branch Related commits: 1. 2f10855 2. 7de93bb 3. 1f201ae 4. 5e35bb3 5. 2b15a1f - #31437: [Issue] Updating with StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup (reported by @m2-assistant[bot]) has been fixed in #31436 by @AnnaAPak in 2.4-develop branch Related commits: 1. 1f04b0a - #31327: [Issue] Removed CliIndexerReindexActionGroup action group usage for Catalog module (reported by @m2-assistant[bot]) has been fixed in #31320 by @sergiy-v in 2.4-develop branch Related commits: 1. 3a808ff 2. a40f256 3. 57e23c6 4. 9ca51cd - #31471: [Issue] Fix issue with logging each cookie as separate context (reported by @m2-assistant[bot]) has been fixed in #31334 by @aleksinoleg in 2.4-develop branch Related commits: 1. 01eb682 - #31445: [Issue] Update varnish 6 vcl config (reported by @m2-assistant[bot]) has been fixed in #31330 by @mrtuvn in 2.4-develop branch Related commits: 1. e07d328 - #31288: FileSystem IO Ftp connection ls() method error for empty folders (reported by @Nazar65) has been fixed in #31308 by @Nazar65 in 2.4-develop branch Related commits: 1. 5559a51 2. c42d022 - #30784: [Issue] [MFTF] Add AssertStorefrontCartDiscountActionGroup (reported by @m2-assistant[bot]) has been fixed in #30776 by @Usik2203 in 2.4-develop branch Related commits: 1. 7806115 2. 1851fe8 3. 91e72ed 4. d4e7e1e 5. 57011bd 6. a231737
2 parents 95b1233 + 976b696 commit 6f79389

File tree

62 files changed

+505
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+505
-235
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminChangeWebSiteAssignedToProductActionGroup.xml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminChangeWebSiteAssignedToProductActionGroup" extends="AddWebsiteToProductActionGroup">
12+
<annotations>
13+
<description>Extends AddWebsiteToProductActionGroup. Changes website assigned to product from websiteToDeselect to website</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="websiteToDeselect" type="string"/>
17+
</arguments>
18+
19+
<uncheckOption selector="{{ProductInWebsitesSection.website(websiteToDeselect)}}" stepKey="uncheckWebsite" after="checkWebsite"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCheckProductOnProductGridActionGroup.xml

+18-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
7-
-->
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
88

9-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminCheckProductOnProductGridActionGroup">
12-
<annotations>
13-
<description>Check the checkbox for the product on the Product Grid</description>
14-
</annotations>
15-
<arguments>
16-
<argument name="product" type="entity"/>
17-
</arguments>
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCheckProductOnProductGridActionGroup">
11+
<annotations>
12+
<description>Check the checkbox for the product on the Product Grid</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="product" type="entity"/>
16+
</arguments>
1817

19-
<checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku(product.sku)}}" stepKey="selectProduct"/>
18+
<checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku(product.sku)}}" stepKey="selectProduct"/>
2019

21-
</actionGroup>
22-
</actionGroups>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetPriceForMassUpdateActionGroup.xml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSetPriceForMassUpdateActionGroup">
12+
<annotations>
13+
<description>Click the "Change" checkbox for the "Price" field. Set new price.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="price" type="string"/>
17+
</arguments>
18+
19+
<scrollTo stepKey="scrollToPriceCheckBox" selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" x="0" y="-160"/>
20+
<click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="selectPriceCheckBox"/>
21+
<fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="{{price}}"/>
22+
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSortProductsGridByActionGroup.xml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSortProductsGridByActionGroup">
12+
<annotations>
13+
<description>Sorts the Product Grid by field</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="field" type="string"/>
17+
</arguments>
18+
19+
<click selector="{{AdminProductGridSection.columnHeader(field)}}" stepKey="clickWebsitesHeaderToSort"/>
20+
<waitForLoadingMaskToDisappear stepKey="waitForApplyingChanges"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminProductPriceUpdatedOnEditPageActionGroup.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertAdminProductPriceUpdatedOnEditPageActionGroup" extends="OpenEditProductOnBackendActionGroup">
12+
<annotations>
13+
<description>Validate if Product price is updated on the Product creation/edit page</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="product" type="entity"/>
17+
<argument name="price" type="string"/>
18+
</arguments>
19+
20+
<waitForPageLoad stepKey="waitForProductToLoad"/>
21+
<seeInField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="seeProductName"/>
22+
<seeInField selector="{{AdminProductFormSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSku"/>
23+
<seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{price}}" stepKey="seeProductPrice"/>
24+
</actionGroup>
25+
</actionGroups>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<comment userInput="Clear cache and reindex | Comment is kept to preserve the step key for backward compatibility" stepKey="cleanCache"/>
5858
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
59-
<argument name="indices" value=""/>
59+
<argument name="indices" value="catalog_product_price"/>
6060
</actionGroup>
6161
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
6262
<argument name="tags" value=""/>

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@
5858
<actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton"/>
5959
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
6060
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
61-
<!--Clear cache and reindex-->
62-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
63-
<argument name="indices" value=""/>
64-
</actionGroup>
61+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
6562
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
6663
<argument name="tags" value=""/>
6764
</actionGroup>

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
</createData>
3434
<!-- Create simple product -->
3535
<createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
36-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCatalogSearch">
37-
<argument name="indices" value="catalogsearch_fulltext"/>
38-
</actionGroup>
36+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindexCatalogSearch"/>
3937
<!-- Login to Admin page -->
4038
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
4139
</before>

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

+42-34
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,60 @@
2929
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3030
</after>
3131

32-
<!--Open Product Index Page-->
3332
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
3433

35-
<!--Search products using keyword -->
36-
<actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
37-
<argument name="keyword" value="Testp"/>
38-
</actionGroup>
34+
<actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="searchByKeyword"/>
3935

40-
<!--Sort Products by ID in descending order-->
4136
<actionGroup ref="SortProductsByIdDescendingActionGroup" stepKey="sortProductsByIdDescending"/>
4237

43-
<!--Select products-->
44-
<checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct1.sku$$)}}" stepKey="selectFirstProduct"/>
45-
<checkOption selector="{{AdminProductGridSection.productRowCheckboxBySku($$simpleProduct2.sku$$)}}" stepKey="selectSecondProduct"/>
38+
<actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="selectFirstProduct">
39+
<argument name="product" value="$simpleProduct1$"/>
40+
</actionGroup>
41+
<actionGroup ref="AdminCheckProductOnProductGridActionGroup" stepKey="selectSecondProduct">
42+
<argument name="product" value="$simpleProduct2$"/>
43+
</actionGroup>
44+
45+
<actionGroup ref="AdminClickMassUpdateProductAttributesActionGroup" stepKey="clickDropdown"/>
46+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickChangeStatus"/>
47+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForProductAttributePageToLoad"/>
4648

47-
<!-- Update product price-->
48-
<click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickDropdown"/>
49-
<click selector="{{AdminProductGridSection.bulkActionOption('Update attributes')}}" stepKey="clickChangeStatus"/>
50-
<waitForPageLoad stepKey="waitForProductAttributePageToLoad"/>
51-
<scrollTo stepKey="scrollToPriceCheckBox" selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" x="0" y="-160"/>
52-
<click selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="selectPriceCheckBox"/>
53-
<fillField stepKey="fillPrice" selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="90.99"/>
54-
<click stepKey="clickOnSaveButton" selector="{{AdminEditProductAttributesSection.Save}}"/>
55-
<waitForPageLoad stepKey="waitForUpdatedProductToSave" />
56-
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
49+
<actionGroup ref="AdminSetPriceForMassUpdateActionGroup" stepKey="scrollToPriceCheckBox">
50+
<argument name="price" value="90.99"/>
51+
</actionGroup>
52+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectPriceCheckBox"/>
53+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="fillPrice"/>
54+
55+
<actionGroup ref="AdminSaveProductsMassAttributesUpdateActionGroup" stepKey="clickOnSaveButton"/>
56+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForUpdatedProductToSave"/>
57+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeAttributeUpateSuccessMsg"/>
5758

58-
<!-- Start message queue -->
5959
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueueConsumer">
6060
<argument name="consumerName" value="{{AdminProductAttributeUpdateConsumerData.consumerName}}"/>
6161
<argument name="maxMessages" value="{{AdminProductAttributeUpdateConsumerData.messageLimit}}"/>
6262
</actionGroup>
63-
<!-- Run cron -->
63+
6464
<magentoCLI command="cron:run --group=index" stepKey="runCron"/>
6565

66-
<!--Verify product name, sku and updated price-->
67-
<click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
68-
<waitForPageLoad stepKey="waitForFirstProductToLoad"/>
69-
<seeInField stepKey="seeFirstProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct1.name$$"/>
70-
<seeInField stepKey="seeFirstProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct1.sku$$"/>
71-
<seeInField stepKey="seeFirstProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
72-
<click stepKey="clickOnBackButton" selector="{{AdminGridMainControls.back}}"/>
73-
<waitForPageLoad stepKey="waitForProductsToLoad"/>
74-
<click stepKey="openSecondProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct2.sku$$)}}"/>
75-
<waitForPageLoad stepKey="waitForSecondProductToLoad"/>
76-
<seeInField stepKey="seeSecondProductNameInField" selector="{{AdminProductFormSection.productName}}" userInput="$$simpleProduct2.name$$"/>
77-
<seeInField stepKey="seeSecondProductSkuInField" selector="{{AdminProductFormSection.productSku}}" userInput="$$simpleProduct2.sku$$"/>
78-
<seeInField stepKey="seeSecondProductPriceInField" selector="{{AdminProductFormSection.productPrice}}" userInput="90.99"/>
66+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openFirstProduct"/>
67+
<actionGroup ref="AssertAdminProductPriceUpdatedOnEditPageActionGroup" stepKey="waitForFirstProductToLoad">
68+
<argument name="product" value="$$simpleProduct1$$"/>
69+
<argument name="price" value="90.99"/>
70+
</actionGroup>
71+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeFirstProductNameInField"/>
72+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeFirstProductSkuInField"/>
73+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeFirstProductPriceInField"/>
74+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickOnBackButton"/>
75+
76+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="waitForProductsToLoad"/>
77+
78+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openSecondProduct"/>
79+
<actionGroup ref="AssertAdminProductPriceUpdatedOnEditPageActionGroup" stepKey="waitForSecondProductToLoad">
80+
<argument name="product" value="$$simpleProduct2$$"/>
81+
<argument name="price" value="90.99"/>
82+
</actionGroup>
83+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSecondProductNameInField"/>
84+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSecondProductSkuInField"/>
85+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSecondProductPriceInField"/>
86+
7987
</test>
8088
</tests>

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@
141141

142142
<!-- Save the second product -->
143143
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
144-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
145-
<argument name="indices" value=""/>
146-
</actionGroup>
144+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
147145
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
148146
<argument name="tags" value=""/>
149147
</actionGroup>

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

+19-20
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</createData>
2626

2727
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
28-
<!--Create new website -->
28+
2929
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
3030
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
3131
<argument name="websiteCode" value="{{customWebsite.code}}"/>
@@ -52,31 +52,30 @@
5252
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5353
</after>
5454

55-
<!--Assign Custom Website to Simple Product -->
56-
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
57-
58-
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
55+
<actionGroup ref="AdminClearFiltersActionGroup" stepKey="navigateToCatalogProductGrid"/>
56+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickClearFiltersInitial"/>
5957
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="assignCustomWebsiteToProduct">
6058
<argument name="product" value="$$productAssignedToCustomWebsite$$"/>
6159
</actionGroup>
62-
<scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
63-
<conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
64-
<waitForPageLoad stepKey="waitForPageOpened"/>
65-
<uncheckOption selector="{{ProductInWebsitesSection.website(_defaultWebsite.name)}}" stepKey="deselectMainWebsite"/>
66-
<checkOption selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectWebsite"/>
67-
68-
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
69-
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
60+
<actionGroup ref="AdminChangeWebSiteAssignedToProductActionGroup" stepKey="scrollToWebsites">
61+
<argument name="website" value="{{customWebsite.name}}"/>
62+
<argument name="websiteToDeselect" value="{{_defaultWebsite.name}}"/>
63+
</actionGroup>
64+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandSection"/>
65+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageOpened"/>
66+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="deselectMainWebsite"/>
67+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="selectWebsite"/>
68+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="clickSave"/>
69+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSaveProductMessageAgain"/>
7070

71-
<!--Navigate To Product Grid To Check Website Sorting-->
7271
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
73-
74-
<!--Sorting works (By Websites) ASC-->
75-
<click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
72+
<actionGroup ref="AdminSortProductsGridByActionGroup" stepKey="clickWebsitesHeaderToSortAsc">
73+
<argument name="field" value="Websites"/>
74+
</actionGroup>
7675
<see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="Main Website" stepKey="checkIfProduct1WebsitesAsc"/>
77-
78-
<!--Sorting works (By Websites) DESC-->
79-
<click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortDesc"/>
76+
<actionGroup ref="AdminSortProductsGridByActionGroup" stepKey="clickWebsitesHeaderToSortDesc">
77+
<argument name="field" value="Websites"/>
78+
</actionGroup>
8079
<see selector="{{AdminProductGridSection.productGridContentsOnRow('1')}}" userInput="{{customWebsite.name}}" stepKey="checkIfProduct1WebsitesDesc"/>
8180
</test>
8281
</tests>

0 commit comments

Comments
 (0)