Merge branch '2.4-develop' into improved-date-format-of-js-console-messages

Author: engcom-Dash

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -333,9 +333,15 @@ public function testSaveAndReplaceAdvancedPricesAddRowErrorCall(): void
                 'bunch'
             ]
         ];
+        $count = 0;
         $this->dataSourceModel
             ->method('getNextUniqueBunch')
-            ->willReturnOnConsecutiveCalls($testBunch);
+            ->willReturnCallback(function () use (&$count, $testBunch) {
+                if ($count == 0) {
+                    $count++;
+                    return $testBunch;
+                }
+            });
         $this->advancedPricing->expects($this->once())->method('validateRow')->willReturn(false);
         $this->advancedPricing->method('saveProductPrices')->willReturnSelf();
 
@@ -405,9 +411,15 @@ public function testSaveAndReplaceAdvancedPricesAppendBehaviourDataAndCalls(
         $advancedPricing
             ->method('getBehavior')
             ->willReturn(Import::BEHAVIOR_APPEND);
+        $count = 0;
         $this->dataSourceModel
             ->method('getNextUniqueBunch')
-            ->willReturnOnConsecutiveCalls($data);
+            ->willReturnCallback(function () use (&$count, $data) {
+                if ($count == 0) {
+                    $count++;
+                    return $data;
+                }
+            });
         $advancedPricing->method('validateRow')->willReturn(true);
 
         $advancedPricing->method('getCustomerGroupId')->willReturnMap(
@@ -529,9 +541,16 @@ public function testSaveAndReplaceAdvancedPricesReplaceBehaviourInternalCalls():
         $this->advancedPricing->method('getBehavior')->willReturn(
             Import::BEHAVIOR_REPLACE
         );
+
+        $count = 0;
         $this->dataSourceModel
             ->method('getNextUniqueBunch')
-            ->willReturnOnConsecutiveCalls($data);
+            ->willReturnCallback(function () use (&$count, $data) {
+                if ($count == 0) {
+                    $count++;
+                    return $data;
+                }
+            });
         $this->advancedPricing->expects($this->once())->method('validateRow')->willReturn(true);
 
         $this->advancedPricing
@@ -582,9 +601,15 @@ public function testDeleteAdvancedPricingFormListSkuToDelete(): void
             ]
         ];
 
+        $count = 0;
         $this->dataSourceModel
             ->method('getNextUniqueBunch')
-            ->willReturnOnConsecutiveCalls($data);
+            ->willReturnCallback(function () use (&$count, $data) {
+                if ($count == 0) {
+                    $count++;
+                    return $data;
+                }
+            });
         $this->advancedPricing->method('validateRow')->willReturn(true);
         $expectedSkuList = ['sku value'];
         $this->advancedPricing

app/code/Magento/Authorization/Test/Fixture/Role.php

@@ -13,6 +13,7 @@
 use Magento\Authorization\Model\RulesFactory;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\DataObject;
+use Magento\TestFramework\Fixture\Api\DataMerger;
 use Magento\TestFramework\Fixture\Data\ProcessorInterface;
 use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
 
@@ -25,13 +26,16 @@ class Role implements RevertibleDataFixtureInterface
         'role_name' => 'Role Name %uniqid%',
         'role_type' => Group::ROLE_TYPE,
         'user_id' => 0,
-        'user_type' => UserContextInterface::USER_TYPE_ADMIN
+        'user_type' => UserContextInterface::USER_TYPE_ADMIN,
+        'pid' => 0,
+        'gws_is_all' => 1,
+        'gws_websites' => null,
+        'gws_store_groups' => null,
+        'resources' => self::RESOURCES
     ];
 
-    private const DEFAULT_DATA_RULES = [
-        'id' => null,
-        'role_id' => null,
-        'resources' => ['Magento_Backend::all']
+    private const RESOURCES = [
+        'Magento_Backend::all'
     ];
 
     /**
@@ -54,39 +58,59 @@ class Role implements RevertibleDataFixtureInterface
      */
     private $rulesFactory;
 
+    /**
+     * @var DataMerger
+     */
+    private $dataMerger;
+
     /**
      * @param RoleFactory $roleFactory
      * @param RoleResource $roleResourceModel
      * @param RulesFactory $rulesFactory
      * @param ProcessorInterface $dataProcessor
+     * @param DataMerger $dataMerger
      */
     public function __construct(
         RoleFactory        $roleFactory,
         RoleResource       $roleResourceModel,
         RulesFactory       $rulesFactory,
-        ProcessorInterface $dataProcessor
+        ProcessorInterface $dataProcessor,
+        DataMerger         $dataMerger
     ) {
         $this->roleFactory = $roleFactory;
         $this->roleResourceModel = $roleResourceModel;
         $this->rulesFactory = $rulesFactory;
         $this->dataProcessor = $dataProcessor;
+        $this->dataMerger = $dataMerger;
     }
 
     /**
      * @inheritdoc
      */
     public function apply(array $data = []): ?DataObject
     {
+        $data = $this->prepareData($data);
+
+        $websites = $this->convertGwsWebsiteStoreGroups($data['gws_websites']);
+        $storeGroups = $this->convertGwsWebsiteStoreGroups($data['gws_store_groups']);
+
         $role = $this->roleFactory->create();
-        $role->setData($this->prepareData(array_diff_key($data, self::DEFAULT_DATA_RULES)));
-        $this->roleResourceModel->save($role);
+        $role->setRoleName($data['role_name'])
+            ->setRoleType($data['role_type'])
+            ->setPid($data['pid'])
+            ->setUserType($data['user_type'])
+            ->setGwsIsAll($data['gws_is_all'])
+            ->setGwsWebsites($websites)
+            ->setGwsStoreGroups($storeGroups);
+
+        $result = $role->save();
 
-        $rules = $this->rulesFactory->create();
-        $rules->setRoleId($role->getId() ?? null);
-        $rules->setResources($data['resources'] ?? self::DEFAULT_DATA_RULES['resources']);
-        $rules->saveRel();
+        $this->rulesFactory->create()
+            ->setRoleId($result['role_id'])
+            ->setResources($data['resources'] ?? self::RESOURCES)
+            ->saveRel();
 
-        return $role;
+        return $result;
     }
 
     /**
@@ -110,7 +134,26 @@ public function revert(DataObject $data): void
      */
     private function prepareData(array $data): array
     {
-        $data = array_merge(self::DEFAULT_DATA, $data);
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
         return $this->dataProcessor->process($this, $data);
     }
+
+    /**
+     * Convert GWS websites and store groups to string
+     *
+     * @param $data
+     * @return string|null
+     */
+    private function convertGwsWebsiteStoreGroups($data): ?string
+    {
+        if (isset($data)) {
+            if (is_array($data)) {
+                return implode(',', $data);
+            }
+            if (is_string($data)) {
+                return $data;
+            }
+        }
+        return null;
+    }
 }

app/code/Magento/AwsS3/Test/Unit/Driver/AwsS3Test.php

@@ -439,8 +439,8 @@ public function testSearchDirectory(): void
         $this->metadataProviderMock->expects(self::any())->method('getMetadata')
             ->willReturnMap([
                 ['path', ['type' => AwsS3::TYPE_DIR]],
-                ['path/1', ['type' => AwsS3::TYPE_FILE]],
-                ['path/2', ['type' => AwsS3::TYPE_FILE]],
+                ['path/1', ['type' => AwsS3::TYPE_DIR]],
+                ['path/2', ['type' => AwsS3::TYPE_DIR]],
             ]);
         $this->adapterMock->expects(self::atLeastOnce())->method('listContents')
             ->willReturn(new \ArrayIterator($subPaths));

app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml

@@ -23,5 +23,7 @@
         <element name="errorMessage" type="text" selector=".message.message-error.error"/>
         <element name="warningMessage" type="text" selector=".message-warning"/>
         <element name="noticeMessage" type="text" selector=".message-notice"/>
+        <element name="assertCacheManagementConfigurationStatus" type="button" selector="//td[@data-column='tags' and contains(text(),'CONFIG')]/following-sibling::td//span[@class='grid-severity-notice']//span"/>
+        <element name="assertCacheManagementLayoutsStatus" type="button" selector="//td[@data-column='tags' and contains(text(),'LAYOUT_GENERAL_CACHE_TAG')]/following-sibling::td//span[@class='grid-severity-notice']//span"/>
     </section>
 </sections>

app/code/Magento/Backend/Test/Mftf/Test/AdminOrderCreateAfterHtmlMinificationTest.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/************************************************************************
+ *
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ *
+ * ************************************************************************
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminOrderCreateAfterHtmlMinificationTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Admin Panel with HTML minification"/>
+            <title value="Admin panel should allow order creation with HTML minification enabled"/>
+            <description value="Admin panel should allow order creation with HTML minification enabled"/>
+            <testCaseId value="AC-12329"/>
+            <useCaseId value="ACP2E-3169"/>
+            <severity value="MAJOR"/>
+            <group value="backend"/>
+            <group value="cloud"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{MinifyHtmlFilesEnableConfigData.path}} {{MinifyHtmlFilesEnableConfigData.value}}" stepKey="enableHtmlMinification"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+            <magentoCLI command="setup:static-content:deploy -f" stepKey="deployStaticContent"/>
+            <createData entity="Simple_US_Customer_CA" stepKey="createSimpleCustomer"/>
+            <createData entity="ApiProductWithDescription" stepKey="createSimpleProduct"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{MinifyHtmlFilesDisableConfigData.path}} {{MinifyHtmlFilesDisableConfigData.value}}" stepKey="disableHtmlMinification"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+            <magentoCLI command="setup:static-content:deploy -f" stepKey="deployStaticContent"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createSimpleCustomer" stepKey="deleteSimpleCustomer"/>
+        </after>
+        <waitForPageLoad stepKey="waitForPageLoadOnDashboard"/>
+        <actionGroup ref="AssertAdminPageTitleActionGroup" stepKey="seeDashboardTitle">
+            <argument name="value" value="Dashboard"/>
+        </actionGroup>
+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="customer" value="$$createSimpleCustomer$$"/>
+        </actionGroup>
+    </test>
+</tests>

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

@@ -11,12 +11,11 @@
         <meta name="viewport" content="width=1024"/>
         <meta name="format-detection" content="telephone=no"/>
         <link src="requirejs/require.js"/>
-        <css src="extjs/resources/css/ext-all.css"/>
-        <css src="extjs/resources/css/ytheme-magento.css"/>
     </head>
     <body>
         <attribute name="id" value="html-body"/>
         <block name="require.js" class="Magento\Backend\Block\Page\RequireJs" template="Magento_Backend::page/js/require_js.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="head.critical" as="head.critical" template="Magento_Backend::page/container.phtml"/>
         <block class="Magento\Framework\View\Element\Template" name="head.additional" template="Magento_Backend::page/container.phtml"/>
         <referenceContainer name="global.notices">
             <block class="Magento\Backend\Block\Page\Notices" name="global_notices" as="global_notices" template="Magento_Backend::page/notices.phtml"/>

app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js

@@ -75,7 +75,7 @@ define([
                         byteConvert(currentFile.size);
 
                     // check if file is allowed to upload and resize
-                    allowedResize = $.inArray(currentFile.extension, allowedExt) !== -1;
+                    allowedResize = $.inArray(currentFile.extension?.toLowerCase(), allowedExt) !== -1;
 
                     if (!allowedResize)  {
                         fileUploader.aggregateError(currentFile.name,

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

@@ -18,9 +18,8 @@
             <testCaseId value="MC-115"/>
             <group value="Bundle"/>
             <group value="cloud"/>
-            <skip>
-                <issueId value="AC-12124">Fotorama lib isn't loaded</issueId>
-            </skip>
+            <!-- Excluded from PR builds due to AC-12124 -->
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

@@ -19,6 +19,9 @@
             <group value="Bundle"/>
             <group value="pr_exclude"/>
             <group value="cloud"/>
+            <skip>
+                <issueId value="AC-10826"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="ApiProductWithDescription" stepKey="simpleProduct1" before="bundleProduct"/>

app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

@@ -1179,9 +1179,11 @@ function ($key) use ($optionCollection, $selectionCollection) {
 
         $this->arrayUtility->expects($this->once())->method('flatten')->willReturn($bundleOptions);
 
-        $selectionCollection
-            ->method('getItems')
-            ->willReturnOnConsecutiveCalls([$selection], []);
+        $callCount = 0;
+        $selectionCollection->method('getItems')
+            ->willReturnCallback(function () use (&$callCount, $selection) {
+                return $callCount++ === 0 ? [$selection] : [];
+            });
         $selectionCollection
             ->method('getSize')
             ->willReturnOnConsecutiveCalls(1, 0);
@@ -1362,6 +1364,7 @@ public function testPrepareForCartAdvancedParentClassReturnString(): void
 
     /**
      * @return void
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testPrepareForCartAdvancedAllRequiredOption(): void
     {
@@ -1452,12 +1455,14 @@ function ($key) use ($optionCollection) {
         $buyRequest->expects($this->once())
             ->method('getBundleOption')
             ->willReturn([3 => 5]);
+        $callCount = 0;
         $option->method('getId')
-            ->willReturnOnConsecutiveCalls(3);
+            ->willReturnCallback(function () use (&$callCount) {
+                return $callCount++ === 0 ? 3 : '';
+            });
         $option->expects($this->once())
             ->method('getRequired')
             ->willReturn(true);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('Please select all required options.', $result);
     }
@@ -1630,9 +1635,11 @@ public function testGetSkuWithoutType(): void
         $selectionMock->expects(($this->any()))
             ->method('getItemByColumnValue')
             ->willReturn($selectionItemMock);
-        $selectionItemMock
-            ->method('getEntityId')
-            ->willReturnOnConsecutiveCalls(1);
+        $callCount = 0;
+        $selectionItemMock->method('getEntityId')
+            ->willReturnCallback(function () use (&$callCount) {
+                return $callCount++ === 0 ? 1 : '';
+            });
         $selectionItemMock->expects($this->once())
             ->method('getSku')
             ->willReturn($itemSku);