Merge remote-tracking branch 'origin/MAGETWO-60589' into MPI-PR-2704

Author: isavchuk-magento

app/code/Magento/Checkout/view/frontend/web/js/action/redirect-on-success.js

@@ -8,9 +8,10 @@
  */
 define(
     [
-        'mage/url'
+        'mage/url',
+        'Magento_Checkout/js/model/full-screen-loader'
     ],
-    function (url) {
+    function (url, fullScreenLoader) {
         'use strict';
 
         return {
@@ -20,6 +21,7 @@ define(
              * Provide redirect to page
              */
             execute: function () {
+                fullScreenLoader.startLoader();
                 window.location.replace(url.build(this.redirectUrl));
             }
         };

app/code/Magento/Payment/view/frontend/web/transparent.js

@@ -9,8 +9,9 @@ define([
     'mage/template',
     'Magento_Ui/js/modal/alert',
     'jquery/ui',
-    'Magento_Payment/js/model/credit-card-validation/validator'
-], function ($, mageTemplate, alert) {
+    'Magento_Payment/js/model/credit-card-validation/validator',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function ($, mageTemplate, alert, ui, validator, fullScreenLoader) {
     'use strict';
 
     $.widget('mage.transparent', {
@@ -107,8 +108,8 @@ define([
                  * {Function}
                  */
                 beforeSend: function () {
-                    this.element.trigger('showAjaxLoader');
-                }.bind(this),
+                    fullScreenLoader.startLoader();
+                },
 
                 /**
                  * {Function}
@@ -131,6 +132,8 @@ define([
                         );
                         this._postPaymentToGateway(preparedData);
                     } else {
+                        fullScreenLoader.stopLoader(true);
+
                         msg = response['error_messages'];
 
                         if (this.options.context) {

dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/redirect-on-success.test.js

@@ -0,0 +1,38 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento_Checkout/js/action/redirect-on-success', function () {
+        var injector = new Squire(),
+            RedirectOnSuccess,
+            FullScreenLoader;
+
+        beforeEach(function (done) {
+            window.checkoutConfig = {
+                defaultSuccessPageUrl: 'checkout/success'
+            };
+            injector.require(['Magento_Checkout/js/action/redirect-on-success',
+                'Magento_Checkout/js/model/full-screen-loader'], function (action, loader) {
+                RedirectOnSuccess = action;
+                FullScreenLoader = loader;
+                spyOn(FullScreenLoader, 'startLoader');
+                done();
+            });
+        });
+
+        it('Checks if loader is called before redirect to success page.', function () {
+            spyOn(window.location, 'replace').and.returnValue(false);
+
+            RedirectOnSuccess.execute();
+
+            expect(FullScreenLoader.startLoader).toHaveBeenCalled();
+        });
+    });
+});