Merge branch 'MAGETWO-60982' of github.com:magento-troll/magento2ce into Troll_PR

Author: slopukhov

dev/tests/js/jasmine/tests/lib/mage/backend/bootstrap.test.js

@@ -0,0 +1,34 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* global jQuery */
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'squire',
+    'mage/backend/notification'
+], function ($, Squire) {
+    'use strict';
+
+    var injector = new Squire();
+
+    describe('mage/backend/bootstrap', function () {
+        beforeEach(function (done) {
+            injector.require(['mage/backend/bootstrap'], function () {
+                done();
+            });
+        });
+        describe('"sendPostponeRequest" method', function () {
+            it('should insert "Error" notification if request failed', function () {
+                jQuery('<div class="page-main-actions"></div>').appendTo('body');
+                jQuery('body').notification();
+
+                jQuery.ajax().abort();
+
+                expect(jQuery('.message-error').length).toBe(1);
+                expect(jQuery('body:contains("A technical problem with the server created an error")').length).toBe(1);
+            });
+        });
+    });
+});

lib/web/mage/backend/bootstrap.js

@@ -7,9 +7,11 @@
 define([
     'jquery',
     'mage/apply/main',
+    'mage/backend/notification',
     'Magento_Ui/js/lib/knockout/bootstrap',
-    'mage/mage'
-], function ($, mage) {
+    'mage/mage',
+    'mage/translate'
+], function ($, mage, notification) {
     'use strict';
 
     var bootstrap;
@@ -67,6 +69,29 @@ define([
                     }
                 } catch (e) {}
             }
+        },
+
+        /**
+         * Error callback.
+         */
+        error: function () {
+            $('body').notification('clear')
+                .notification('add', {
+                    error: true,
+                    message: $.mage.__(
+                        'A technical problem with the server created an error. ' +
+                        'Try again to continue what you were doing. If the problem persists, try again later.'
+                    ),
+
+                    /**
+                     * @param {String} message
+                     */
+                    insertMethod: function (message) {
+                        var $wrapper = $('<div/>').html(message);
+
+                        $('.page-main-actions').after($wrapper);
+                    }
+                });
         }
     });
 
@@ -83,7 +108,7 @@ define([
         /*
          * Initialization of notification widget
          */
-        $('body').mage('notification');
+        notification({}, $('body'));
     };
 
     $(bootstrap);