Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-90828-tech-debt-cleanup-background-attributes-for-banner

Author: tjwiebell

app/design/adminhtml/Magento/backend/web/css/source/components/_file-uploader.less

@@ -66,6 +66,7 @@
         opacity: 0;
         overflow: hidden;
         position: absolute;
+        visibility: hidden;
         width: 0;
 
         &:focus {
@@ -241,7 +242,7 @@
     }
 }
 
-// Placeholder for multiple uploader
+//  Placeholder for multiple uploader
 .file-uploader-placeholder {
     &.placeholder-document {
         .lib-icon-font(

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js

@@ -114,6 +114,7 @@ define([
                 $.ajax = jasmine.createSpy().and.callFake(function (req) {
                     request = req.success;
                 });
+                jQueryMethods.notification = $.fn.notification;
                 $.fn.notification = jasmine.createSpy();
                 obj.urls.beforeSave = 'requestPath';
                 obj.save();

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

@@ -2,45 +2,35 @@
  * 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) {
+    'mage/backend/bootstrap'
+], function ($) {
     'use strict';
 
-    var injector = new Squire();
-
     describe('mage/backend/bootstrap', function () {
-        beforeEach(function (done) {
-            injector.require(['mage/backend/bootstrap'], function () {
-                done();
-            });
+        var $pageMainActions;
+
+        beforeEach(function () {
+            $pageMainActions = $('<div class="page-main-actions"></div>');
         });
 
         afterEach(function () {
-            try {
-                injector.clean();
-                injector.remove();
-            } catch (e) {}
+            $pageMainActions.remove();
         });
 
         describe('"sendPostponeRequest" method', function () {
-            it('should insert "Error" notification if request failed', function (done) {
-                jQuery('<div class="page-main-actions"></div>').appendTo('body');
-                jQuery('body').notification();
+            it('should insert "Error" notification if request failed', function () {
+                $pageMainActions.appendTo('body');
+                $('body').notification();
 
-                jQuery.ajax().abort();
+                $.ajaxSettings.error();
 
-                setTimeout(function () {
-                    expect(jQuery('.message-error').length).toBe(1);
-                    expect(
-                        jQuery('body:contains("A technical problem with the server created an error")').length
-                    ).toBe(1);
-                    done();
-                }, 1);
+                expect($('.message-error').length).toBe(1);
+                expect(
+                    $('body:contains("A technical problem with the server created an error")').length
+                ).toBe(1);
             });
         });
     });