Merge remote-tracking branch 'origin/2.4-develop' into gl_pr_arrows_april21_2022

rimple-saini · rimple-saini · commit ae60e4999a6b · 2022-05-15T23:23:27.000+05:30
diff --git a/app/code/Magento/Checkout/view/frontend/requirejs-config.js b/app/code/Magento/Checkout/view/frontend/requirejs-config.js
@@ -15,5 +15,10 @@ var config = {
             proceedToCheckout:      'Magento_Checkout/js/proceed-to-checkout',
             catalogAddToCart:       'Magento_Catalog/js/catalog-add-to-cart'
         }
+    },
+    shim: {
+        'Magento_Checkout/js/model/totals' : {
+            deps: ['Magento_Customer/js/customer-data']
+        }
     }
 };
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/redirect-on-success.js b/app/code/Magento/Checkout/view/frontend/web/js/action/redirect-on-success.js
@@ -22,13 +22,13 @@ define(
              */
             execute: function () {
                 fullScreenLoader.startLoader();
-                this.reloadPage();
+                this.redirectToSuccessPage();
             },
 
             /**
-             * Method to reload page
+             * Redirect to success page.
              */
-            reloadPage: function () {
+            redirectToSuccessPage: function () {
                 window.location.replace(url.build(this.redirectUrl));
             }
         };
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js b/app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js
@@ -24,7 +24,7 @@ define([
             messageContainer = messageContainer || globalMessageList;
 
             if (response.status == 401) { //eslint-disable-line eqeqeq
-                this.reloadPage(url.build('customer/account/login/'));
+                this.redirectTo(url.build('customer/account/login/'));
             } else {
                 try {
                     error = JSON.parse(response.responseText);
@@ -38,9 +38,9 @@ define([
         },
 
         /**
-         * Method to reload page
+         * Method to redirect by requested URL.
          */
-        reloadPage: function (redirectUrl) {
+        redirectTo: function (redirectUrl) {
             window.location.replace(redirectUrl);
         }
     };
diff --git a/app/code/Magento/Cookie/view/base/requirejs-config.js b/app/code/Magento/Cookie/view/base/requirejs-config.js
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerShowDimensionsModeCommand.php
@@ -19,9 +19,9 @@
  */
 class IndexerShowDimensionsModeCommand extends AbstractIndexerCommand
 {
-    const INPUT_KEY_INDEXER = 'indexer';
-    const DIMENSION_MODE_NONE = 'none';
-    const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
+    private const INPUT_KEY_INDEXER = 'indexer';
+    private const DIMENSION_MODE_NONE = 'none';
+    private const XML_PATH_DIMENSIONS_MODE_MASK = 'indexer/%s/dimensions_mode';
     /**
      * @var string
      */
@@ -36,24 +36,31 @@ class IndexerShowDimensionsModeCommand extends AbstractIndexerCommand
      * @var string[]
      */
     private $indexers;
+    /**
+     * @var string[]
+     */
+    private $optionalIndexers;
 
     /**
      * @param ObjectManagerFactory $objectManagerFactory
      * @param ScopeConfigInterface $configReader
      * @param array $indexers
+     * @param array $optionalIndexers
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
         ScopeConfigInterface $configReader,
-        array $indexers
+        array $indexers,
+        array $optionalIndexers = []
     ) {
         $this->configReader = $configReader;
         $this->indexers = $indexers;
+        $this->optionalIndexers = $optionalIndexers;
         parent::__construct($objectManagerFactory);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
@@ -64,7 +71,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @param InputInterface $input
      * @param OutputInterface $output
      * @return int
@@ -92,10 +99,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(sprintf('%-50s ', $indexer->getTitle() . ':') . $mode);
             }
         } catch (\Exception $e) {
-            $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
-            $output->writeln($e->getMessage() . PHP_EOL);
-            // we must have an exit code higher than zero to indicate something was wrong
-            $returnValue = Cli::RETURN_FAILURE;
+            if (!in_array($indexerId, $this->optionalIndexers)) { /** @phpstan-ignore-line */
+                $output->writeln('"' . $indexer->getTitle() . '" indexer process unknown error:' . PHP_EOL);
+                $output->writeln($e->getMessage() . PHP_EOL);
+                // we must have an exit code higher than zero to indicate something was wrong
+                $returnValue = Cli::RETURN_FAILURE;
+            }
         }
 
         return $returnValue;
@@ -112,7 +121,7 @@ private function getInputList(): array
         $arguments[] = new InputArgument(
             self::INPUT_KEY_INDEXER,
             InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-            $optionDescription . ' (' . implode($this->indexers) . ')'
+            $optionDescription . ' (' . implode(',', $this->indexers) . ')'
         );
 
         return $arguments;
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerShowDimensionsModeCommandTest.php
@@ -41,16 +41,26 @@ class IndexerShowDimensionsModeCommandTest extends AbstractIndexerCommandCommonS
      */
     private $indexerMock;
 
+    /**
+     * @var string[]
+     */
+    private $optionalIndexers;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManagerHelper;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
-        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->configReaderMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->indexers = ['indexer_1' => 'indexer_1', 'indexer_2' => 'indexer_2'];
-        $this->command = $objectManagerHelper->getObject(
+        $this->command = $this->objectManagerHelper->getObject(
             IndexerShowDimensionsModeCommand::class,
             [
                 'objectManagerFactory' => $this->objectManagerFactory,
@@ -98,6 +108,29 @@ public function testExecuteWithAttributes($command, $consoleOutput)
         );
     }
 
+    public function testExecuteWithOptionalIndexers()
+    {
+        $this->optionalIndexers = ['indexer_3'];
+        $this->indexers = ['indexer_3'=> 'indexer_3'];
+        $this->command = $this->objectManagerHelper->getObject(
+            IndexerShowDimensionsModeCommand::class,
+            [
+                'objectManagerFactory' => $this->objectManagerFactory,
+                'configReader'         => $this->configReaderMock,
+                'indexers'             => $this->indexers,
+                'optionalIndexers'     => $this->optionalIndexers
+            ]
+        );
+        $command = ['indexer' => ['indexer_3']];
+        $this->configureAdminArea();
+        /** @var CommandTester $commandTester */
+        $commandTester = new CommandTester($this->command);
+        $this->indexerMock->method('load')->willThrowException(new \InvalidArgumentException());
+        $commandTester->execute($command);
+        $actualValue = $commandTester->getDisplay();
+        $this->assertEquals('', $actualValue);
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/ProductVideo/etc/csp_whitelist.xml b/app/code/Magento/ProductVideo/etc/csp_whitelist.xml
@@ -15,12 +15,14 @@
                 <value id="vimeo" type="host">vimeo.com</value>
                 <value id="www_vimeo" type="host">www.vimeo.com</value>
                 <value id="vimeo_cdn" type="host">*.vimeocdn.com</value>
+                <value id="youtube" type="host">*.youtube.com</value>
             </values>
         </policy>
         <policy id="img-src">
             <values>
                 <value id="vimeo_cdn" type="host">*.vimeocdn.com</value>
                 <value id="youtube_image" type="host">i.ytimg.com</value>
+                <value id="youtube" type="host">*.youtube.com</value>
             </values>
         </policy>
         <policy id="frame-src">
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -47,8 +47,7 @@ var config = {
             'jquery-ui-modules/widget': 'jquery/ui-modules/widget',
             'jquery-ui-modules/timepicker': 'jquery/timepicker',
             'vimeo': 'vimeo/player',
-            'vimeoWrapper': 'vimeo/vimeo-wrapper',
-            'jquery/jquery.cookie': 'js-cookie/cookie-wrapper'
+            'vimeoWrapper': 'vimeo/vimeo-wrapper'
         }
     },
     shim: {
@@ -69,7 +68,8 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
         'prototype': 'legacy-build.min',
-        'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
+        'jquery/jquery.cookie': 'js-cookie/cookie-wrapper',
+        'jquery/jquery-storageapi': 'js-storage/storage-wrapper',
         'text': 'mage/requirejs/text',
         'domReady': 'requirejs/domReady',
         'spectrum': 'jquery/spectrum/spectrum',
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/Category/Plugin/StorageTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/Category/Plugin/StorageTest.php
@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\Product\Media\ConfigInterface;
 use Magento\Framework\App\Bootstrap as AppBootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Driver\File;
@@ -139,6 +140,9 @@ private function removeFiles(): void
      */
     private function removeProducts(): void
     {
+        $resource = $this->objectManager->get(ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $connection->delete('catalog_category_product');
         foreach ($this->createdProductsSkus as $sku) {
             try {
                 $this->productRepository->deleteById($sku);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php
@@ -11,12 +11,14 @@
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\UrlRewrite\Model\OptionProvider;
+use Magento\UrlRewrite\Model\Storage\DbStorage;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use PHPUnit\Framework\Exception;
@@ -44,6 +46,9 @@ protected function setUp(): void
      */
     public function testGenerateUrlRewritesWithoutSaveHistory()
     {
+        $resource = $this->objectManager->get(ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $connection->delete(DbStorage::TABLE_NAME);
         /** @var Category $category */
         $category = $this->objectManager->create(Category::class);
         $category->load(3);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Cms\Model\Wysiwyg;
 
+use Magento\Framework\View\DesignInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestModuleWysiwygConfig\Model\Config as TestModuleWysiwygConfig;
 
@@ -18,13 +19,19 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
      */
     private $model;
 
+    /**
+     * @var DesignInterface
+     */
+    private $design;
+
     /**
      * {@inheritdoc}
      */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->model = $objectManager->create(\Magento\Cms\Model\Wysiwyg\Config::class);
+        $this->design = $objectManager->get(DesignInterface::class);
     }
 
     /**
@@ -46,7 +53,8 @@ public function testGetConfig()
     public function testGetConfigCssUrls()
     {
         $config = $this->model->getConfig();
-        $publicPathPattern = 'http://localhost/static/%s/adminhtml/Magento/backend/en_US/%s';
+        $designTheme = $this->design->getConfigurationDesignTheme('adminhtml');
+        $publicPathPattern = "http://localhost/static/%s/adminhtml/{$designTheme}/en_US/%s";
         $tinyMceConfig = $config->getData('tinymce');
         $contentCss = $tinyMceConfig['content_css'];
         if (is_array($contentCss)) {
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Newsletter\Model;
 
 use Magento\Framework\App\TemplateTypesInterface;
+use Magento\Framework\View\DesignInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -97,8 +98,11 @@ public function testGetProcessedTemplateArea($area, $design)
      */
     public function getProcessedTemplateAreaDataProvider()
     {
+        $designTheme = Bootstrap::getObjectManager()
+            ->get(DesignInterface::class)
+            ->getConfigurationDesignTheme('adminhtml');
         return [
-            'backend' => ['adminhtml', 'Magento/backend']
+            'backend' => ['adminhtml', $designTheme]
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php
@@ -147,7 +147,7 @@ private function getDefaultThemePath($area)
             case 'frontend':
                 return $this->design->getConfigurationDesignTheme($area);
             case 'adminhtml':
-                return 'Magento/backend';
+                return $this->design->getConfigurationDesignTheme($area);
             case 'doc':
                 return 'Magento/blank';
             default:
diff --git a/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js b/dev/tests/js/jasmine/spec_runner/tasks/jasmine.js
@@ -70,8 +70,7 @@ function init(config) {
                 helpers: specs,
                 sandboxArgs: {
                     args: ['--no-sandbox', '--disable-setuid-sandbox'],
-                    defaultViewport: {width: 400, height: 400, hasTouch: true},
-                    slowMo: 10000
+                    defaultViewport: {width: 400, height: 400, hasTouch: true}
                 }
             }
         };
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js
@@ -35,7 +35,7 @@ define([
         });
 
         it('Checks if loader is called before redirect to success page.', function () {
-            spyOn(RedirectOnSuccess, 'reloadPage').and.callFake(function () {});
+            spyOn(RedirectOnSuccess, 'redirectToSuccessPage').and.callFake(function () {});
             RedirectOnSuccess.execute();
 
             expect(FullScreenLoader.startLoader).toHaveBeenCalled();
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js
@@ -62,7 +62,7 @@ define([
             it('check on failed status', function () {
                 var messageContainer = jasmine.createSpyObj('globalMessageList', ['addErrorMessage']);
 
-                spyOn(model, 'reloadPage').and.callFake(function () {});
+                spyOn(model, 'redirectTo').and.callFake(function () {});
                 model.process({
                     status: 401,
                     responseText: ''
diff --git a/lib/web/jquery/jquery.storageapi.min.js b/lib/web/jquery/jquery.storageapi.min.js
diff --git a/lib/web/js-cookie/cookie-wrapper.js b/lib/web/js-cookie/cookie-wrapper.js
diff --git a/lib/web/js-cookie/js.cookie.min.js b/lib/web/js-cookie/js.cookie.min.js
diff --git a/lib/web/js-storage/js.storage.js b/lib/web/js-storage/js.storage.js
diff --git a/lib/web/js-storage/storage-wrapper.js b/lib/web/js-storage/storage-wrapper.js
diff --git a/package.json.sample b/package.json.sample

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,10 @@ var config = {`
`15`	`15`	`proceedToCheckout: 'Magento_Checkout/js/proceed-to-checkout',`
`16`	`16`	`catalogAddToCart: 'Magento_Catalog/js/catalog-add-to-cart'`
`17`	`17`	`}`
	`18`	`+ },`
	`19`	`+ shim: {`
	`20`	`+ 'Magento_Checkout/js/model/totals' : {`
	`21`	`+ deps: ['Magento_Customer/js/customer-data']`
	`22`	`+ }`
`18`	`23`	`}`
`19`	`24`	`};`