Merge remote-tracking branch 'mainline/2.4-develop' into ACP2E-1640+ACP2E-1621

Author: o-dubovyk

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -21,14 +21,18 @@
         <before>
             <!--Enable Async Configuration-->
             <magentoCLI stepKey="EnableAsyncConfig" command="setup:config:set --no-interaction --config-async 1"/>
-            <magentoCLI stepKey="ClearConfigCache" command="cache:flush"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="ClearConfigCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <!--Login to Admin-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
         </before>
         <after>
             <magentoCLI stepKey="DisableAsyncConfig" command="setup:config:set --no-interaction --config-async 0"/>
             <magentoCLI stepKey="setBackDefaultConfigValue" command="config:set catalog/frontend/grid_per_page 12" />
-            <magentoCLI stepKey="ClearConfigCache" command="cache:clean"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="ClearConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 

app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php

@@ -10,6 +10,7 @@
  */
 class Plugin
 {
+    private const MESSAGES_LIMIT = 5;
     /**
      * @var \Magento\AdminNotification\Model\System\MessageFactory
      */
@@ -95,27 +96,32 @@ public function afterToArray(
             $this->bulkNotificationManagement->getAcknowledgedBulksByUser($userId)
         );
         $bulkMessages = [];
+        $messagesCount = 0;
+        $data = [];
         foreach ($userBulks as $bulk) {
             $bulkUuid = $bulk->getBulkId();
             if (!in_array($bulkUuid, $acknowledgedBulks)) {
-                $details = $this->operationDetails->getDetails($bulkUuid);
-                $text = $this->getText($details);
-                $bulkStatus = $this->statusMapper->operationStatusToBulkSummaryStatus($bulk->getStatus());
-                if ($bulkStatus === \Magento\Framework\Bulk\BulkSummaryInterface::IN_PROGRESS) {
-                    $text = __('%1 item(s) are currently being updated.', $details['operations_total']) . $text;
+                if ($messagesCount < self::MESSAGES_LIMIT) {
+                    $details = $this->operationDetails->getDetails($bulkUuid);
+                    $text = $this->getText($details);
+                    $bulkStatus = $this->statusMapper->operationStatusToBulkSummaryStatus($bulk->getStatus());
+                    if ($bulkStatus === \Magento\Framework\Bulk\BulkSummaryInterface::IN_PROGRESS) {
+                        $text = __('%1 item(s) are currently being updated.', $details['operations_total']) . $text;
+                    }
+                    $data = [
+                        'data' => [
+                            'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
+                            'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
+                            // md5() here is not for cryptographic use.
+                            // phpcs:ignore Magento2.Security.InsecureFunction
+                            'identity' => md5('bulk' . $bulkUuid),
+                            'uuid' => $bulkUuid,
+                            'status' => $bulkStatus,
+                            'created_at' => $bulk->getStartTime()
+                        ]
+                    ];
+                    $messagesCount++;
                 }
-                $data = [
-                    'data' => [
-                        'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
-                        'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
-                        // md5() here is not for cryptographic use.
-                        // phpcs:ignore Magento2.Security.InsecureFunction
-                        'identity' => md5('bulk' . $bulkUuid),
-                        'uuid' => $bulkUuid,
-                        'status' => $bulkStatus,
-                        'created_at' => $bulk->getStartTime()
-                    ]
-                ];
                 $bulkMessages[] = $this->messageFactory->create($data)->toArray();
             }
         }

app/code/Magento/AsynchronousOperations/Test/Unit/Model/ResourceModel/System/Message/Collection/Synchronized/PluginTest.php

@@ -27,6 +27,7 @@
  */
 class PluginTest extends TestCase
 {
+    private const MESSAGES_LIMIT = 5;
     /**
      * @var Plugin
      */
@@ -163,6 +164,60 @@ public function testAfterTo($operationDetails)
         $this->assertEquals(2, $result2['totalRecords']);
     }
 
+    /**
+     * Tests that message building operations don't get called more than Plugin::MESSAGES_LIMIT times
+     *
+     * @return void
+     */
+    public function testAfterToWithMessageLimit()
+    {
+        $result = ['items' =>[], 'totalRecords' => 1];
+        $messagesCount = self::MESSAGES_LIMIT + 1;
+        $userId = 1;
+        $bulkUuid = 2;
+        $bulkArray = [
+            'status' => BulkSummaryInterface::NOT_STARTED
+        ];
+
+        $bulkMock = $this->getMockBuilder(BulkSummary::class)
+            ->addMethods(['getStatus'])
+            ->onlyMethods(['getBulkId', 'getDescription', 'getStartTime'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $userBulks = array_fill(0, $messagesCount, $bulkMock);
+        $bulkMock->expects($this->exactly($messagesCount))
+            ->method('getBulkId')->willReturn($bulkUuid);
+        $this->operationsDetailsMock
+            ->expects($this->exactly(self::MESSAGES_LIMIT))
+            ->method('getDetails')
+            ->with($bulkUuid)
+            ->willReturn([
+                'operations_successful' => 1,
+                'operations_failed' => 0
+            ]);
+        $bulkMock->expects($this->exactly(self::MESSAGES_LIMIT))
+            ->method('getDescription')->willReturn('Bulk Description');
+        $this->messagefactoryMock->expects($this->exactly($messagesCount))
+            ->method('create')->willReturn($this->messageMock);
+        $this->messageMock->expects($this->exactly($messagesCount))->method('toArray')->willReturn($bulkArray);
+        $this->authorizationMock
+            ->expects($this->once())
+            ->method('isAllowed')
+            ->with($this->resourceName)
+            ->willReturn(true);
+        $this->userContextMock->expects($this->once())->method('getUserId')->willReturn($userId);
+        $this->bulkNotificationMock
+            ->expects($this->once())
+            ->method('getAcknowledgedBulksByUser')
+            ->with($userId)
+            ->willReturn([]);
+        $this->statusMapper->expects($this->exactly(self::MESSAGES_LIMIT))
+            ->method('operationStatusToBulkSummaryStatus');
+        $this->bulkStatusMock->expects($this->once())->method('getBulksByUser')->willReturn($userBulks);
+        $result2 = $this->plugin->afterToArray($this->collectionMock, $result);
+        $this->assertEquals($result['totalRecords'] + $messagesCount, $result2['totalRecords']);
+    }
+
     /**
      * @return array
      */

app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminCreateDownloadableProductWithLinkTest.xml

@@ -35,6 +35,7 @@
             <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
             <!-- Delete customer -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
 
             <!-- Delete category -->
@@ -81,7 +82,9 @@
 
         <!-- Save product -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
-        <magentoCron stepKey="runIndexCronJobs" groups="index"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Login to frontend -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signIn">

app/code/Magento/Backend/Model/Auth/Session.php

@@ -114,6 +114,16 @@ public function __construct(
         );
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_isFirstAfterLogin = null;
+        $this->acl = null;
+    }
+
     /**
      * Refresh ACL resources stored in session
      *

app/code/Magento/Backend/Model/Session/Quote.php

@@ -139,6 +139,17 @@ public function __construct(
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_quote = null;
+        $this->_store = null;
+        $this->_order = null;
+    }
+
     /**
      * Retrieve quote model object
      *
@@ -154,7 +165,7 @@ public function getQuote()
                     $this->_quote->setCustomerGroupId($customerGroupId);
                     $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
-                    
+
                     $this->quoteRepository->save($this->_quote);
                     $this->setQuoteId($this->_quote->getId());
                     $this->_quote = $this->quoteRepository->get($this->getQuoteId(), [$this->getStoreId()]);

app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

@@ -23,11 +23,13 @@
         <click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
         <fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
         <click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <waitForElementClickable selector="{{AdminSecondaryGridSection.firstRow}}" stepKey="waitForResult"/>
         <click stepKey="clickResult" selector="{{AdminSecondaryGridSection.firstRow}}"/>
         <waitForPageLoad stepKey="waitForTaxRateLoad"/>
 
         <!-- delete the rule -->
-        <waitForElementVisible selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="waitForDelete"/>
+        <waitForElementClickable selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="waitForDelete"/>
         <click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmationModal"/>
         <click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>

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

@@ -18,5 +18,8 @@
         <element name="defaultLocale" type="checkbox" selector="#general_locale_code_inherit"/>
         <element name="checkIfTabExpand" type="button" selector="#general_locale-head:not(.open)"/>
         <element name="timeZoneDropdown" type="select" selector="//select[@id='general_locale_timezone']"/>
+        <element name="changeStoreConfigButton" type="button" selector="//button[@id='store-change-button']"/>
+        <element name="changeStoreConfigToSpecificWebsite" type="select" selector="//a[contains(text(),'{{var}}')]" parameterized="true"/>
+        <element name="changeWebsiteConfirmButton" type="button" selector="//button[@class='action-primary action-accept']/span"/>
     </section>
 </sections>

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

@@ -58,7 +58,9 @@
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
                 <argument name="customStore" value="storeViewData7"/>
             </actionGroup>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -94,7 +96,9 @@
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
             <argument name="customStore" value="storeViewData7"/>
         </actionGroup>
-        <magentoCron groups="index" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Navigate to Product attribute page-->
         <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="navigateToNewProductAttributePage"/>

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

@@ -15,19 +15,23 @@
             <title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
             <description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
             <group value="backend"/>
-            <severity value="MINOR"></severity>
+            <severity value="MINOR"/>
             <testCaseId value="MC-35895"/>
             <group value="pr_exclude"/>
         </annotations>
 
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <magentoCLI stepKey="enableSendFriend" command="config:set sendfriend/email/enabled 1"/>
-            <magentoCLI stepKey="cacheClean" command="cache:clean config"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="disableSendFriend" command="config:set sendfriend/email/enabled 0"/>
-            <magentoCLI stepKey="cacheClean" command="cache:clean config"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 

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

@@ -51,6 +51,7 @@
                 <argument name="tags" value="config full_page"/>
             </actionGroup>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>

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

@@ -20,7 +20,7 @@
             <group value="backend"/>
             <skip>
                 <issueId value="DEPRECATED">Use AdminCheckDashboardWithChartsTest instead</issueId>
-            </skip> 
+            </skip>
             <group value="pr_exclude"/>
         </annotations>
         <before>
@@ -32,14 +32,17 @@
                 <field key="firstname">John1</field>
                 <field key="lastname">Doe1</field>
             </createData>
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Reset admin order filter -->
             <comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>

app/code/Magento/Backup/Controller/Adminhtml/Index/Download.php

@@ -6,9 +6,10 @@
  */
 namespace Magento\Backup\Controller\Adminhtml\Index;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
-class Download extends \Magento\Backup\Controller\Adminhtml\Index
+class Download extends \Magento\Backup\Controller\Adminhtml\Index implements HttpGetActionInterface
 {
     /**
      * @var \Magento\Framework\Controller\Result\RawFactory
@@ -66,17 +67,12 @@ public function execute()
 
         $fileName = $this->_objectManager->get(\Magento\Backup\Helper\Data::class)->generateBackupDownloadName($backup);
 
-        $this->_fileFactory->create(
+        return $this->_fileFactory->create(
             $fileName,
-            null,
+            ['type' => 'filename', 'value' => $backup->getPath() . DIRECTORY_SEPARATOR . $backup->getFileName()],
             DirectoryList::VAR_DIR,
             'application/octet-stream',
             $backup->getSize()
         );
-
-        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
-        $resultRaw = $this->resultRawFactory->create();
-        $resultRaw->setContents($backup->output());
-        return $resultRaw;
     }
 }

app/code/Magento/Backup/Model/ResourceModel/Db.php

@@ -301,7 +301,7 @@ public function rollBackTransaction()
      */
     public function runCommand($command)
     {
-        $this->connection->query($command);
+        $this->connection->multiQuery($command);
         return $this;
     }
 }