Merge pull request #37 from magento-commerce/1.5.1-fixes

PB-1140: [PB][CLOUD] Page Builder Error popup appears

Author: omiroshnichenko

app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/events-mixin.js

@@ -3,48 +3,56 @@
  * See COPYING.txt for license details.
  */
 
-define(['underscore', 'Magento_PageBuilderAdminAnalytics/js/page-builder/event-builder'],
-    function (_, EventBuilder) {
-        'use strict';
-
-        return function (target) {
-            var originalTarget = target.trigger,
-                isAdminAnalyticsEnabled,
-                event,
-                hasPageBuilderBeenUsed = false;
-
-            /**
-             * Invokes custom code to track information regarding Page Builder usage
-             *
-             * @param {String} name
-             * @param {Array} args
-             */
-
-            target.trigger = function (name, args) {
-                originalTarget.apply(originalTarget, [name, args]);
-                isAdminAnalyticsEnabled =
-                    !_.isUndefined(window.digitalData) &&
-                    !_.isUndefined(window._satellite);
-
-                if (!hasPageBuilderBeenUsed && name.indexOf('stage:fullScreenModeChangeAfter') !== -1 &&
-                    args.fullScreen && isAdminAnalyticsEnabled
-                ) {
-                    hasPageBuilderBeenUsed = true;
-                    window.digitalData.page.url = window.location.href;
-                    window.digitalData.page.attributes = {
-                        editedWithPageBuilder: 'true'
-                    };
-                    window._satellite.track('page');
-                }
-
-                event = EventBuilder.build(name, args);
-
-                if (isAdminAnalyticsEnabled && !_.isUndefined(window.digitalData.event) && !_.isUndefined(event)) {
-                    window.digitalData.event.push(event);
-                    window._satellite.track('event');
-                }
-            };
-
-            return target;
+define([
+    'underscore',
+    'Magento_PageBuilderAdminAnalytics/js/page-builder/event-builder'
+], function (_, EventBuilder) {
+    'use strict';
+
+    return function (target) {
+        var originalTarget = target.trigger,
+            isAdminAnalyticsEnabled,
+            event,
+            hasPageBuilderBeenUsed = false,
+            delayedPush;
+
+        /**
+         * Invokes custom code to track information regarding Page Builder usage
+         *
+         * @param {String} name
+         * @param {Array} args
+         */
+
+        target.trigger = function (name, args) {
+            originalTarget.apply(originalTarget, [name, args]);
+            isAdminAnalyticsEnabled =
+                !_.isUndefined(window.digitalData) &&
+                !_.isUndefined(window._satellite);
+
+            if (!hasPageBuilderBeenUsed && name.indexOf('stage:fullScreenModeChangeAfter') !== -1 &&
+                args.fullScreen && isAdminAnalyticsEnabled
+            ) {
+                hasPageBuilderBeenUsed = true;
+                window.digitalData.page.url = window.location.href;
+                window.digitalData.page.attributes = {
+                    editedWithPageBuilder: 'true'
+                };
+                window._satellite.track('page');
+            }
+
+            event = EventBuilder.build(name, args);
+
+            if (isAdminAnalyticsEnabled && !_.isUndefined(window.digitalData.event) && !_.isUndefined(event)) {
+                delayedPush = setInterval(function (object) {
+                    if (_.isArray(window.digitalData.event)) {
+                        window.digitalData.event.push(object);
+                        window._satellite.track('event');
+                        clearInterval(delayedPush);
+                    }
+                }, 500, event);
+            }
         };
-    });
+
+        return target;
+    };
+});

dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder/events-mixin.test.js

@@ -0,0 +1,64 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var injector = new Squire(),
+        eventObject = {
+            field: 'value'
+        },
+        mocks = {
+            'Magento_PageBuilderAdminAnalytics/js/page-builder/event-builder': {
+                build: jasmine.createSpy().and.returnValue(eventObject)
+            }
+        },
+        mixin,
+        uiEvents,
+        empty = {},
+        origSatellite = window._satellite;
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require([
+            'Magento_PageBuilderAdminAnalytics/js/page-builder/events-mixin',
+            'uiEvents'
+        ], function (Mixin, UiEvents) {
+            mixin = Mixin;
+            uiEvents = UiEvents;
+            done();
+        });
+        window.digitalData = {
+            event: empty
+        };
+        window._satellite = {
+            track: jasmine.createSpy()
+        };
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+            window._satellite = origSatellite;
+        } catch (e) {
+        }
+    });
+
+    describe('Magento_PageBuilderAdminAnalytics/js/page-builder/events-mixin', function () {
+        it('Check event is pushed to array', function (done) {
+            mixin(uiEvents).trigger('name', 'arg');
+            expect(window.digitalData.event).toBe(empty);
+            window.digitalData.event = [];
+            setTimeout(function () {
+                expect(window.digitalData.event).toEqual([eventObject]);
+                done();
+            }, 1000);
+        });
+    });
+});