ACP2E-1542: Pagebuilder floating editor adds "tabindex" attribute when editing hyperlink and saving the template

Author: bubasuma

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/image-uploader.test.js

@@ -6,8 +6,9 @@
 
 /* eslint-disable max-nested-callbacks */
 define([
+    'jquery',
     'squire'
-], function (Squire) {
+], function ($, Squire) {
     'use strict';
 
     var uploader,
@@ -72,7 +73,7 @@ define([
 
     beforeEach(function (done) {
         injector.mock(mocks);
-        injector.require(['Magento_PageBuilder/js/form/element/image-uploader', 'jquery'], function (ImageUploader, $) {
+        injector.require(['Magento_PageBuilder/js/form/element/image-uploader'], function (ImageUploader) {
             /**
              * A stub constructor to bypass the original
              * @constructor
@@ -113,7 +114,7 @@ define([
                 expect(uploader.$uploadArea.removeClass).toHaveBeenCalledWith('foo bar');
             });
 
-            scenarios.forEach(function (scenario, i) {
+            $.each(scenarios, function (i, scenario) {
                 it('Should add modifier classes if configuration is met in scenario ' + i, function () {
                     uploader.elementWidthModifierClasses = scenario.config;
                     spyOn(uploader.$uploadArea, 'is').and.returnValue(true);

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/wysiwyg.test.js

@@ -6,41 +6,34 @@
 
 /* eslint-disable max-nested-callbacks */
 define([
-    'squire'
-], function (Squire) {
+    'jquery',
+    'Magento_PageBuilder/js/form/element/wysiwyg'
+], function ($, UiWysiwyg) {
     'use strict';
 
-    var injector = new Squire(),
-        mocks = {
-            'Magento_PageBuilder/js/events': jasmine.createSpyObj('events',['on', 'trigger']),
-            'Magento_PageBuilder/js/page-builder': function () {}
-        },
-        wysiwyg,
-        $;
+    var wysiwyg;
 
-    beforeEach(function (done) {
-        injector.mock(mocks);
-        injector.require(['Magento_PageBuilder/js/form/element/wysiwyg', 'jquery'], function (UiWysiwyg, jq) {
-            var MockWysiwyg = function () {};
+    function createWysiwygMock() {
+        var mock,
+            MockWysiwyg = function () {};
 
-            MockWysiwyg.prototype = Object.create(UiWysiwyg.prototype);
-            MockWysiwyg.prototype.constructor = MockWysiwyg;
-            wysiwyg = new MockWysiwyg();
-            $ = jq;
-            $.extend(wysiwyg, UiWysiwyg.defaults, {pageBuilder: {id: 'pb-wysiwyg-test'}});
-            $(document.body).append(
-                $('<div><div contenteditable="true"><a href="/login"></a><span tabindex="0"></span></div></div>')
-                    .attr('id', wysiwyg.pageBuilder.id)
-            );
-            done();
-        });
+        MockWysiwyg.prototype = Object.create(UiWysiwyg.prototype);
+        MockWysiwyg.prototype.constructor = MockWysiwyg;
+        mock = new MockWysiwyg();
+        $.extend(mock, UiWysiwyg.defaults);
+        return mock;
+    }
+
+    beforeEach(function () {
+        wysiwyg = createWysiwygMock();
+        wysiwyg.pageBuilder = {id: 'pb-wysiwyg-test'};
+        $(document.body).append(
+            $('<div><div contenteditable="true"><a href="/login"></a><span tabindex="0"></span></div></div>')
+                .attr('id', wysiwyg.pageBuilder.id)
+        );
     });
 
     afterEach(function () {
-        try {
-            injector.clean();
-            injector.remove();
-        } catch (e) {}
         $('#' + wysiwyg.pageBuilder.id).remove();
     });