Merge branch 'port-2752' of github.com:magento-mpi/magento2ce into port-2752

Author: YevSent

app/code/Magento/Catalog/view/frontend/web/js/product/storage/storage-service.js

@@ -47,7 +47,7 @@ define([
                  * @param {*} data
                  */
                 add: function (data) {
-                    if (!utils.compare(data, this.data()).equal) {
+                    if (!_.isEmpty(data) && !utils.compare(data, this.data()).equal) {
                         this.data(_.extend(utils.copy(this.data()), data));
                     }
                 },

app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml

@@ -67,9 +67,10 @@ $params = $block->getParams();
                     'jquery',
                     'Magento_Checkout/js/model/quote',
                     'Magento_Checkout/js/action/place-order',
-                    'Magento_Checkout/js/action/redirect-on-success'
+                    'Magento_Checkout/js/action/redirect-on-success',
+                    'Magento_Checkout/js/model/full-screen-loader'
                 ],
-                function($, quote, placeOrderAction, redirectOnSuccessAction) {
+                function($, quote, placeOrderAction, redirectOnSuccessAction, fullScreenLoader) {
                     var parent = window.top;
 
                     $(parent).trigger('clearTimeout');
@@ -79,6 +80,12 @@ $params = $block->getParams();
                         function () {
                             redirectOnSuccessAction.execute();
                         }
+                    ).fail(
+                        function () {
+                            var parent = window.top;
+                            $(parent).trigger('clearTimeout');
+                            fullScreenLoader.stopLoader();
+                        }
                     );
                 }
             );

app/code/Magento/Paypal/Controller/Transparent/Response.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Controller\Transparent;
 
+use Magento\Framework\App\CsrfAwareActionInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\View\Result\LayoutFactory;
@@ -16,11 +17,13 @@
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Sales\Api\PaymentFailuresInterface;
 use Magento\Framework\Session\Generic as Session;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Request\InvalidRequestException;
 
 /**
- * Class Response
+ *  @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Response extends \Magento\Framework\App\Action\Action
+class Response extends \Magento\Framework\App\Action\Action implements CsrfAwareActionInterface
 {
     /**
      * Core registry
@@ -91,6 +94,23 @@ public function __construct(
         $this->paymentFailures = $paymentFailures ?: $this->_objectManager->get(PaymentFailuresInterface::class);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function createCsrfValidationException(
+        RequestInterface $request
+    ): ?InvalidRequestException {
+        return null;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validateForCsrf(RequestInterface $request): ?bool
+    {
+        return true;
+    }
+
     /**
      * @return ResultInterface
      */

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/MassDeleteTest.php

@@ -125,7 +125,7 @@ public function failedRequestDataProvider(): array
         return [
             [
                 'ids' => [],
-                'constraint' => self::equalTo(['Please select item(s).']),
+                'constraint' => self::equalTo(['An item needs to be selected. Select and try again.']),
                 'messageType' => MessageInterface::TYPE_ERROR,
             ],
             [
@@ -135,7 +135,7 @@ public function failedRequestDataProvider(): array
             ],
             [
                 'ids' => null,
-                'constraint' => self::equalTo(['Please select item(s).']),
+                'constraint' => self::equalTo(['An item needs to be selected. Select and try again.']),
                 'messageType' => MessageInterface::TYPE_ERROR,
             ]
         ];

dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/storage/storage-service.test.js

@@ -12,22 +12,11 @@ define([
 
     var injector = new Squire(),
         mocks = {
-            'Magento_Catalog/js/product/storage/ids-storage': {
-                name: 'IdsStorage',
-                initialize: jasmine.createSpy().and.returnValue({})
-            },
             'Magento_Catalog/js/product/storage/data-storage': {},
             'Magento_Catalog/js/product/storage/ids-storage-compare': {}
         },
-        obj;
-
-    beforeEach(function (done) {
-        injector.mock(mocks);
-        injector.require(['Magento_Catalog/js/product/storage/storage-service'], function (insance) {
-            obj = insance;
-            done();
-        });
-    });
+        obj,
+        utils;
 
     afterEach(function () {
         try {
@@ -43,6 +32,19 @@ define([
             },
             storage;
 
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require([
+                'Magento_Catalog/js/product/storage/ids-storage',
+                'Magento_Catalog/js/product/storage/storage-service',
+                'mageUtils'
+            ], function (IdsStorage, instance, mageUtils) {
+                obj = instance;
+                utils = mageUtils;
+                done();
+            });
+        });
+
         describe('"createStorage" method', function () {
             it('create new storage', function () {
                 obj.processSubscribers = jasmine.createSpy();
@@ -73,5 +75,54 @@ define([
                 expect(typeof obj.getStorage(config.namespace)).toBe('object');
             });
         });
+        describe('"add" method', function () {
+            var storageValue;
+
+            beforeEach(function () {
+                storage = new obj.createStorage(config);
+                storageValue = {
+                    'property1': 1
+                };
+
+                storage.set(storageValue);
+            });
+
+            it('method exists', function () {
+                expect(storage.add).toBeDefined();
+                expect(typeof storage.add).toEqual('function');
+            });
+
+            it('update value', function () {
+                spyOn(utils, 'copy').and.callThrough();
+                expect(storage.get()).toEqual(storageValue);
+
+                storageValue = {
+                    'property2': 2
+                };
+
+                storage.add(storageValue);
+
+                expect(utils.copy).toHaveBeenCalled();
+                expect(storage.get()).toEqual(
+                    {
+                        'property1': 1,
+                        'property2': 2
+                    }
+                );
+            });
+
+            it('add empty value', function () {
+                spyOn(utils, 'copy').and.callThrough();
+
+                storage.add({});
+
+                expect(utils.copy).not.toHaveBeenCalled();
+                expect(storage.get()).toEqual(
+                    {
+                        'property1': 1
+                    }
+                );
+            });
+        });
     });
 });