MC-3993: Impossible add Slider on Page if it contains block with slider inside

- Fix test failures

Author: davemacaulay

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/map/appearance/default/widget.test.js

@@ -3,46 +3,57 @@
  * See COPYING.txt for license details.
  */
 define([
-    'squire'
-], function (Squire) {
+    'squire',
+    'jquery'
+], function (Squire, $) {
     'use strict';
 
     var mapWidgetInitializer,
         injector = new Squire(),
         mocks = {
             'Magento_PageBuilder/js/utils/map': jasmine.createSpy(),
             'googleMaps': jasmine.createSpy()
-        };
+        },
+        loadWidgetinitializer;
 
-    beforeEach(function (done) {
+    /**
+     * Load the widget initializer for map
+     *
+     * @param {Function} done
+     */
+    loadWidgetinitializer = function (done) {
         injector.mock(mocks);
-        injector.require(['Magento_PageBuilder/js/content-type/map/appearance/default/widget'], function (module) {
-            mapWidgetInitializer = module;
-            done();
-        });
-    });
+        injector.require(
+            ['Magento_PageBuilder/js/content-type/map/appearance/default/widget'],
+            function (module) {
+                mapWidgetInitializer = module;
+                done();
+            }
+        );
+    };
 
     describe('Magento_PageBuilder/js/content-type/map/appearance/default/widget', function () {
+        beforeEach(loadWidgetinitializer);
 
         it('Does not call googleMap constructor if element is missing data-locations', function () {
-            var el = document.createElement('div');
+            var el = $('div');
 
             mapWidgetInitializer(undefined, el);
 
             expect(mocks.googleMaps).not.toHaveBeenCalled();
         });
 
         it('Calls googleMap constructor if element has data-locations', function () {
-            var el = document.createElement('div'),
+            var el = $('<div />'),
                 locationsJSON = '[{"position": {"latitude": 0, "longitude": 0}}]';
 
-            el.setAttribute('data-locations', locationsJSON);
-            el.setAttribute('data-show-controls', true);
+            el.attr('data-locations', locationsJSON);
+            el.attr('data-show-controls', true);
 
             mapWidgetInitializer(undefined, el);
 
             expect(mocks['Magento_PageBuilder/js/utils/map']).toHaveBeenCalledWith(
-                el,
+                el[0],
                 JSON.parse(locationsJSON),
                 {
                     disableDefaultUI: false,

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget-initializer.test.js

@@ -15,25 +15,39 @@ define([
             'mage/apply/main': {
                 applyFor: jasmine.createSpy()
             }
-        };
+        },
+        loadWidgetInitializer,
+        removeCreatedElement;
 
-    beforeEach(function (done) {
+    /**
+     * Load the widget initializer for the tests
+     *
+     * @param {Function} done
+     */
+    loadWidgetInitializer = function (done) {
         injector.mock(mocks);
         injector.require(['Magento_PageBuilder/js/widget-initializer'], function (module) {
             widgetInitializer = module;
             done();
         });
-    });
+    };
 
-    afterEach(function () {
+    /**
+     * Remove any created elements
+     */
+    removeCreatedElement = function () {
         if (el !== undefined) {
             el.remove();
         }
-    });
+    };
 
     describe('Magento_PageBuilder/js/content-type/map/appearance/default/widget', function () {
+        beforeEach(loadWidgetInitializer);
+        afterEach(removeCreatedElement);
+
         it('Calls mage.applyFor on each element with each item present in config', function () {
-            var data;
+            var data,
+                applyForMock;
 
             el = $('<div class="unique-element-class-attr"></div>');
 
@@ -50,8 +64,11 @@ define([
 
             widgetInitializer(data);
 
-            expect(mocks['mage/apply/main'].applyFor).toHaveBeenCalledWith(el, true, 'awesome');
-            expect(mocks['mage/apply/main'].applyFor).toHaveBeenCalledWith(el, true, 'cool');
+            applyForMock = mocks['mage/apply/main'].applyFor;
+            expect(applyForMock).toHaveBeenCalledWith(jasmine.any(Object), true, 'awesome');
+            expect(applyForMock).toHaveBeenCalledWith(jasmine.any(Object), true, 'cool');
+            // Due to jQuery objects not being === we must use jQuery's is to validate if the elements are the same
+            expect(el.is(applyForMock.calls.mostRecent().args[0])).toBeTruthy();
         });
     });
 });