Skip to content

Commit 9f619bf

Browse files
slavvkaslavvka
authored
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
Accepted Community Pull Requests: - #29285: Delete tests images after tests execution (by @Nazar65) - #29199: Resolve Field "Number of Symbols" in CAPTCHA settings has missing range validation (by @edenduong) - #29023: Credit Memo with Zero Total: Order Status "Complete" and not "Closed" (by @engcom-Echo) - #29401: #1714: Change access level for metadata model functions to private (by @joweecaquicla) - #29402: Remove MFTF dependency to adobe stock module (by @Nazar65) - #29399: #1713: Extract image extension from constant of SaveImageInformation to DI configuration (by @jmonteros422) - #29396: Apply review suggestion to the media modules (by @sivaschenko) - #28989: [MFTF] Use ActionGroup to click done on the Search Categories popup (by @Usik2203) - #28608: Update code to reduce redundancy and simplify readability (by @df2k2) - #28993: [MFTF] use action group to save categories (by @Usik2203) - #29300: [2.4] [ISSUE-29299] Fix Build-in README installation command. (by @progreg) - #29222: Remove backup menu if the backup feature is disabled (by @edenduong) - #29035: Adds missing return value in afterSave plugin. (by @hostep) - #28902: Fixing bug with non-existent customer group breaking quote (by @kodubovik) - #28137: #24353 Fix Varnish 6 Too many restarts issue (by @ihor-sviziev) - #29393: #1667: [MFTF] Add a column with an edit link to the Category grid - MFTF coverage (by @jmonteros422) - #29405: Move Source filter to MediaGalleryUi module (by @Nazar65) - #27977: Complex message added for add to cart success message (by @ajithkumar-maragathavel) - #27364: Fix issue #27355 with too many cookies in admin (by @ihor-sviziev) - #29386: [MFTF] Usage already defined action groups (by @Usik2203) - #29341: Refactor ResourceConnection.php (by @lbajsarowicz) - #29422: Fix Replace nestead query with separate queries in the entity filter processor (by @Nazar65) - #29392: MFTF tests coverage for Used In links && fix bug with category grid urlFIlterApplie (by @Nazar65) - #29412: 1716: Use Magento naming approach for FolderTree class (by @joweecaquicla) - #29385: [MFTF] Use action group for search in product grid (by @Usik2203) - #29404: #1691: Add filter placeholders and Display mode options to category grid (by @joweecaquicla) - #28250: Multiple arguments in module:status command (by @chandru-199) - #29331: Fix robots.txt not store specific (by @engcom-Charlie) - #27582: magento/magneto2#27570: fixed issue withsue with store id for cash on… (by @ledian-hymetllari) - #27905: PHPStan add support of magic methods of Data Object. (by @swnsma) Fixed GitHub Issues: - #29198: Field "Number of Symbols" in CAPTCHA settings has missing range validation (reported by @edenduong) has been fixed in #29199 by @edenduong in 2.4-develop branch Related commits: 1. 8176ad5 2. 0d94aba - #22762: Credit Memo with Zero Total: Order Status "Complete" and not "Closed" (reported by @simonmaass) has been fixed in #29023 by @engcom-Echo in 2.4-develop branch Related commits: 1. 8ab5415 2. e2b578d 3. eff9488 4. 0d3cc83 5. f33150d - #29380: [Issue] [MFTF] Use ActionGroup to click done on the Search Categories popup (reported by @m2-assistant[bot]) has been fixed in #28989 by @Usik2203 in 2.4-develop branch Related commits: 1. 1086450 2. 8ec67c3 3. 0d2674e 4. 62bcfd7 5. 2c2926d - #29381: [Issue] Update code to reduce redundancy and simplify readability (reported by @m2-assistant[bot]) has been fixed in #28608 by @df2k2 in 2.4-develop branch Related commits: 1. 01309d8 2. 45a668a 3. 0a1b76a 4. 910da38 5. 9009851 6. 9b954c0 7. eaba8c2 8. 7e7b645 - #29388: [Issue] [MFTF] use action group to save categories (reported by @m2-assistant[bot]) has been fixed in #28993 by @Usik2203 in 2.4-develop branch Related commits: 1. d8b754a 2. ac74a48 3. 109cd09 4. 40e845e 5. c5b7c5d 6. fd36c8b 7. 59b8c11 - #29299: PHP build-in webserver readme cmd line installation command is outdated (reported by @progreg) has been fixed in #29300 by @progreg in 2.4-develop branch Related commits: 1. 80f4195 2. 0747383 3. 91cffc0 - #29280: [Issue] Remove backup menu if the backup feature is disabled (reported by @m2-assistant[bot]) has been fixed in #29222 by @edenduong in 2.4-develop branch Related commits: 1. 3907936 2. dab9581 3. c3d76f7 4. 50b62ea - #29034: Missing return value in Magento\CmsUrlRewrite\Plugin\Cms\Model\Store\View::afterSave can cause saving a storeview to crash (reported by @hostep) has been fixed in #29035 by @hostep in 2.4-develop branch Related commits: 1. 1a73d0e 2. 87ce9e7 3. 39481a5 - #29327: [Issue] Fixing bug with non-existent customer group breaking quote (reported by @m2-assistant[bot]) has been fixed in #28902 by @kodubovik in 2.4-develop branch Related commits: 1. c9fef1b 2. fd77b60 3. f674258 4. e80d7e4 5. 6bbf4d7 6. bdf203e 7. 460ca11 8. 42486a6 - #24353: Magento varnish 6 Too many restarts (reported by @HOSTED-POWER) has been fixed in #28137 by @ihor-sviziev in 2.4-develop branch Related commits: 1. cef2ac3 - #29097: [Issue] Complex message added for add to cart success message (reported by @m2-assistant[bot]) has been fixed in #27977 by @ajithkumar-maragathavel in 2.4-develop branch Related commits: 1. c2bc25a 2. 62c6f94 3. ee2f0cc 4. 812d943 - #17195: Incorrect message: Unable to send the cookie. Maximum number of cookies would be exceeded (reported by @ihor-sviziev) has been fixed in #27364 by @ihor-sviziev in 2.4-develop branch Related commits: 1. 72567f6 - #27355: Adminhtml - Too many mage-translation-file-version cookies (reported by @ihor-sviziev) has been fixed in #27364 by @ihor-sviziev in 2.4-develop branch Related commits: 1. 72567f6 - #29420: [Issue] [MFTF] Usage already defined action groups (reported by @m2-assistant[bot]) has been fixed in #29386 by @Usik2203 in 2.4-develop branch Related commits: 1. 45a3a77 2. 91a6a68 - #29389: [Issue] Refactor ResourceConnection.php (reported by @m2-assistant[bot]) has been fixed in #29341 by @lbajsarowicz in 2.4-develop branch Related commits: 1. 4a83bfb 2. fc67e95 - #1693: Class Magento\Sales\Model\Order\Customer\Management does not exist (reported by @andrew-smart) has been fixed in #29392 by @Nazar65 in 2.4-develop branch Related commits: 1. ebcdce4 2. 2534e46 3. 6c09344 4. 6344ad2 5. 3856236 - #1700: Magento 2 Extension Fund (reported by @kalenjordan) has been fixed in #29392 by @Nazar65 in 2.4-develop branch Related commits: 1. ebcdce4 2. 2534e46 3. 6c09344 4. 6344ad2 5. 3856236 - #29434: [Issue] [MFTF] Use action group for search in product grid (reported by @m2-assistant[bot]) has been fixed in #29385 by @Usik2203 in 2.4-develop branch Related commits: 1. 8f55cd7 2. b13e2ba 3. 7d42d2d 4. 816771c - #29344: [Issue] Multiple arguments in module:status command (reported by @m2-assistant[bot]) has been fixed in #28250 by @chandru-199 in 2.4-develop branch Related commits: 1. 058e2a8 2. 2946c78 3. 39e26a2 4. 73a4bd1 5. 46f74af 6. 1d81ca2 7. 22d8a9e - #28901: Sitemap in robots.txt not store specific (reported by @medialoungeml) has been fixed in #29331 by @engcom-Charlie in 2.4-develop branch Related commits: 1. b1054ad 2. 2020e98 3. 1563ef2 - #27570: Cash on delivery - store label is not being displayed on order/invoice/shipping/creditmemo details. (reported by @swnsma) has been fixed in #27582 by @ledian-hymetllari in 2.4-develop branch Related commits: 1. 352a3d6 2. 1bf3ef9 3. 6f3d633 4. 85fb9c8 5. 2368e87 6. d8afb0e - #28303: [Issue] PHPStan add support of magic methods of Data Object. (reported by @m2-backlog[bot]) has been fixed in #27905 by @swnsma in 2.4-develop branch Related commits: 1. 19b636e 2. 8849d1e 3. dea6c91 4. d825912 5. 313fc6f 6. 6fef300 7. 6c2d86f 8. f4b6d5e 9. c7a02e0 10. 23483fb 11. c973636 12. 9fed236 13. 9c1ba5a 14. 28dbb69 15. 5f0c767 16. 60d6b02 17. 64e5016 18. 61fe852 19. cb50ff6 20. 347c54f 21. a243302 22. 693cc0e 23. 46c8981 24. 4ff058c
2 parents 6cb92ae + ffec9fa commit 9f619bf

File tree

151 files changed

+2175
-775
lines changed

Some content is hidden

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

151 files changed

+2175
-775
lines changed

‎app/code/Magento/Backend/view/adminhtml/layout/default.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
7171
</arguments>
7272
</block>
73-
7473
</container>
7574
</container>
7675
</referenceContainer>

‎app/code/Magento/Backend/view/adminhtml/requirejs-config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9-
'mediaUploader': 'Magento_Backend/js/media-uploader',
10-
'mage/translate': 'Magento_Backend/js/translate'
9+
'mediaUploader': 'Magento_Backend/js/media-uploader'
1110
}
1211
}
1312
};

‎app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminAssertBackupLinkAbsentInMenuActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminAssertBackupLinkAbsentInMenuActionGroup">
12+
<annotations>
13+
<description>Verify 'Backup' link is absent in admin menu.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminMenuSection.menuItem('magento-backend-system')}}" stepKey="clickSystem"/>
17+
<dontSeeElement selector="{{AdminMenuSection.menuItem('magento-backup-system-tools-backup')}}" stepKey="dontSeeBackup"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminSystemBackupMenuTest">
12+
<annotations>
13+
<features value="Backup"/>
14+
<stories value="Backup menu not visible if config disabled"/>
15+
<title value="Backup menu not visible if backup config disabled"/>
16+
<description value="Disable backup config and check backup menu isn't visible"/>
17+
<severity value="AVERAGE"/>
18+
<testCaseId value="MC-36292"/>
19+
<group value="backup"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
26+
</after>
27+
28+
<actionGroup ref="AdminAssertBackupLinkAbsentInMenuActionGroup" stepKey="verifyBackupLinkAbsentInMenu"/>
29+
</test>
30+
</tests>

‎app/code/Magento/Backup/etc/adminhtml/menu.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
99
<menu>
10-
<add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup"/>
10+
<add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup" dependsOnConfig="system/backup/functionality_enabled"/>
1111
</menu>
1212
</config>

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@
163163

164164
<!-- Save the settings -->
165165
<scrollToTopOfPage stepKey="scrollToTop"/>
166-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
167-
<waitForPageLoad stepKey="waitForTaxSaved"/>
166+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
167+
168168
<see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
169169

170170
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -192,8 +192,7 @@
192192

193193
<!-- Save the settings -->
194194
<scrollToTopOfPage stepKey="scrollToTop"/>
195-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
196-
<waitForPageLoad stepKey="waitForTaxSaved"/>
195+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
197196
<see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
198197

199198
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Captcha/etc/adminhtml/system.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<depends>
5858
<field id="enable">1</field>
5959
</depends>
60-
<frontend_class>required-entry</frontend_class>
60+
<frontend_class>required-entry validate-range range-1-8</frontend_class>
6161
</field>
6262
<field id="symbols" translate="label comment" type="text" sortOrder="8" showInDefault="1" canRestore="1">
6363
<label>Symbols Used in CAPTCHA</label>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
</annotations>
1717

1818
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
19+
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
1920
</actionGroup>
2021
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
</annotations>
1515

1616
<click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneButton" />
17+
<waitForPageLoad stepKey="waitForCategoryApply"/>
1718
</actionGroup>
1819
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
2020
<fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
2121
<click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
22+
<waitForPageLoad stepKey="waitForProductSearch"/>
2223
</actionGroup>
2324
</actionGroups>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,6 +1252,20 @@
12521252
<requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
12531253
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
12541254
</entity>
1255+
<entity name="SimpleProduct_zero" type="product">
1256+
<data key="sku" unique="suffix">testSku</data>
1257+
<data key="type_id">simple</data>
1258+
<data key="attribute_set_id">4</data>
1259+
<data key="visibility">4</data>
1260+
<data key="name" unique="suffix">testProductName</data>
1261+
<data key="price">0.00</data>
1262+
<data key="urlKey" unique="suffix">testurlkey</data>
1263+
<data key="status">1</data>
1264+
<data key="quantity">777</data>
1265+
<data key="weight">1</data>
1266+
<requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
1267+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
1268+
</entity>
12551269
<entity name="ApiSimpleOneQty10" type="product2">
12561270
<data key="sku" unique="suffix">api-simple-product</data>
12571271
<data key="type_id">simple</data>

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@
3232
<waitForPageLoad stepKey="waitForPageLoad" />
3333
<actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
3434
<actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
35+
<actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
36+
<argument name="FolderName" value="Storage Root"/>
37+
</actionGroup>
3538
<actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
36-
<argument name="ImageFolder" value="ImageFolder"/>
39+
<argument name="ImageFolder" value="ImageFolder"/>
3740
</actionGroup>
3841
<actionGroup ref="AttachImageActionGroup" stepKey="attachImage1">
3942
<argument name="Image" value="ImageUpload3"/>
@@ -44,12 +47,16 @@
4447
</actionGroup>
4548
<actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
4649
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup" />
47-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
50+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCatalog"/>
4851
<amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
4952
<waitForPageLoad stepKey="waitForPageLoad2"/>
5053
<seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
5154
<seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
5255
<after>
56+
<actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
57+
<actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
58+
<argument name="ImageFolder" value="ImageFolder"/>
59+
</actionGroup>
5360
<actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
5461
<argument name="categoryEntity" value="SimpleSubCategory"/>
5562
</actionGroup>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
<!-- Update product Advanced Inventory setting -->
4242
<click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
4343
<waitForPageLoad stepKey="waitForProductToLoad"/>
44-
<click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
45-
<waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
44+
<actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
4645
<uncheckOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
4746
<selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="Yes" stepKey="clickOnManageStock"/>
4847
<fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="5" stepKey="fillProductQty"/>
@@ -53,9 +52,10 @@
5352
<selectOption selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" userInput="Yes" stepKey="selectQuatityUsesDecimal"/>
5453
<uncheckOption selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQtyConfigSetting}}" stepKey="uncheckNotifyBelowQtyheckBox"/>
5554
<fillField selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQty}}" userInput="1" stepKey="fillNotifyBelowQty"/>
56-
<selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="In Stock" stepKey="selectOutOfStock"/>
57-
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
58-
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
55+
<actionGroup ref="AdminSetStockStatusConfigActionGroup" stepKey="selectOutOfStock">
56+
<argument name="stockStatus" value="In Stock"/>
57+
</actionGroup>
58+
<actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton"/>
5959
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
6060
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
6161
<!--Clear cache and reindex-->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
4040
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
4141
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
42-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
43-
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
42+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
4443
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4544
<!-- Verify Parent Category and Sub category is not visible in navigation menu -->
4645
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
3939
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
4040
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
41-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
42-
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
41+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
4342
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4443
<!-- Verify Parent Category and Sub category is not visible in navigation menu -->
4544
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
4040
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
4141
<checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
42-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
43-
<waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
42+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
4443
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
4544
<!-- Verify Parent Category and Sub category is not visible in navigation menu -->
4645
<amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@
119119
<waitForPageLoad stepKey="waitFroPageToLoad2"/>
120120
<see selector="{{AdminProductGridFilterSection.productCount}}" userInput="30" stepKey="seeNumberOfProductsFound"/>
121121
<click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
122-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
123-
<waitForPageLoad stepKey="waitForCategorySaved"/>
122+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
124123
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
125124
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
126125
<!--Open Category Store Front Page-->

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
<fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
5858
<click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
5959
<click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
60-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
61-
<waitForPageLoad stepKey="waitForCategorySaved"/>
60+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
6261
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
6362
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
6463
<!--Verify the Category Title-->

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,31 @@
4040
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
4141
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
4242
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillFirstSubCategoryName"/>
43-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstSubCategory"/>
44-
<waitForPageLoad stepKey="waitForSFirstSubCategorySaved"/>
43+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstSubCategory"/>
4544
<!-- Verify success message -->
4645
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
4746
<!--Create Nested Second Sub Category-->
4847
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
4948
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondSubCategoryName"/>
50-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondSubCategory"/>
51-
<waitForPageLoad stepKey="waitForSecondCategory"/>
49+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondSubCategory"/>
5250
<!-- Verify success message -->
5351
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage1"/>
5452
<!--Create Nested Third Sub Category/>-->
5553
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton2"/>
5654
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{ThirdLevelSubCat.name}}" stepKey="fillThirdSubCategoryName"/>
57-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveThirdSubCategory"/>
58-
<waitForPageLoad stepKey="waitForThirdCategorySaved"/>
55+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveThirdSubCategory"/>
5956
<!-- Verify success message -->
6057
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage2"/>
6158
<!--Create Nested fourth Sub Category />-->
6259
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton3"/>
6360
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FourthLevelSubCat.name}}" stepKey="fillFourthSubCategoryName"/>
64-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFourthSubCategory"/>
65-
<waitForPageLoad stepKey="waitForFourthCategorySaved"/>
61+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFourthSubCategory"/>
6662
<!-- Verify success message -->
6763
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage3"/>
6864
<!--Create Nested fifth Sub Category />-->
6965
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton4"/>
7066
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FifthLevelCat.name}}" stepKey="fillFifthSubCategoryName"/>
71-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFifthLevelCategory"/>
72-
<waitForPageLoad stepKey="waitForFifthCategorySaved"/>
67+
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFifthLevelCategory"/>
7368
<!-- Verify success message -->
7469
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage4"/>
7570
<amOnPage url="/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}/{{ThirdLevelSubCat.name}}/{{FourthLevelSubCat.name}}/{{FifthLevelCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>

0 commit comments

Comments
 (0)