🔃 [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

Author: slavvka

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

@@ -70,7 +70,6 @@
                             <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
                         </arguments>
                     </block>
-                    
                 </container>
             </container>
         </referenceContainer>

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

@@ -6,8 +6,7 @@
 var config = {
     map: {
         '*': {
-            'mediaUploader':  'Magento_Backend/js/media-uploader',
-            'mage/translate': 'Magento_Backend/js/translate'
+            'mediaUploader':  'Magento_Backend/js/media-uploader'
         }
     }
 };

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

@@ -0,0 +1,19 @@
+<?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="AdminAssertBackupLinkAbsentInMenuActionGroup">
+        <annotations>
+            <description>Verify 'Backup' link is absent in admin menu.</description>
+        </annotations>
+
+        <click selector="{{AdminMenuSection.menuItem('magento-backend-system')}}" stepKey="clickSystem"/>
+        <dontSeeElement selector="{{AdminMenuSection.menuItem('magento-backup-system-tools-backup')}}" stepKey="dontSeeBackup"/>
+    </actionGroup>
+</actionGroups>

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

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSystemBackupMenuTest">
+        <annotations>
+            <features value="Backup"/>
+            <stories value="Backup menu not visible if config disabled"/>
+            <title value="Backup menu not visible if backup config disabled"/>
+            <description value="Disable backup config and check backup menu isn't visible"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-36292"/>
+            <group value="backup"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AdminAssertBackupLinkAbsentInMenuActionGroup" stepKey="verifyBackupLinkAbsentInMenu"/>
+    </test>
+</tests>

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

@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <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"/>
+        <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"/>
     </menu>
 </config>

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

@@ -163,8 +163,8 @@
 
             <!-- Save the settings -->
             <scrollToTopOfPage stepKey="scrollToTop"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
-            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
+
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -192,8 +192,7 @@
 
             <!-- Save the settings -->
             <scrollToTopOfPage stepKey="scrollToTop"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
-            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

@@ -57,7 +57,7 @@
                     <depends>
                         <field id="enable">1</field>
                     </depends>
-                    <frontend_class>required-entry</frontend_class>
+                    <frontend_class>required-entry validate-range range-1-8</frontend_class>
                 </field>
                 <field id="symbols" translate="label comment" type="text" sortOrder="8" showInDefault="1" canRestore="1">
                     <label>Symbols Used in CAPTCHA</label>

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

@@ -16,5 +16,6 @@
         </annotations>
 
         <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
     </actionGroup>
 </actionGroups>

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

@@ -14,5 +14,6 @@
         </annotations>
 
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneButton" />
+        <waitForPageLoad stepKey="waitForCategoryApply"/>
     </actionGroup>
 </actionGroups>

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

@@ -19,5 +19,6 @@
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
     </actionGroup>
 </actionGroups>