Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into ims-phase1

Author: slopukhov

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']
+        }
     }
 };

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));
             }
         };

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);
         }
     };

app/code/Magento/Cookie/view/base/requirejs-config.js

@@ -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">

app/code/Magento/ProductVideo/etc/csp_whitelist.xml

@@ -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',

app/code/Magento/Theme/view/base/requirejs-config.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}
                 }
             }
         };

dev/tests/js/jasmine/spec_runner/tasks/jasmine.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();

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.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: ''

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/model/error-processor.test.js

@@ -9,6 +9,8 @@ define([
 ], function ($, cookie) {
     'use strict';
 
+    window.Cookies = window.Cookies || cookie;
+
     var config = $.cookie = function (key, value, options) {
         if (value !== undefined) {
             options = $.extend({}, config.defaults, options);
@@ -36,7 +38,7 @@ define([
         }
 
         return result;
-    }
+    };
 
     config.defaults = {};