qunit: syncronized executeAsyncMock setups and terminates

Author: juleari

packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js

@@ -15,8 +15,6 @@ QUnit.testStart(function() {
     $('#qunit-fixture').html(markup);
 });
 
-executeAsyncMock.setup();
-
 const BOOTSTRAP_CSS_URL = window.ROOT_URL + 'packages/devextreme-themebuilder/node_modules/bootstrap/dist/css/bootstrap.css';
 
 const applyBootstrap = (function() {

packages/devextreme/testing/tests/DevExpress.knockout/collectionWidget.tests.js

@@ -123,6 +123,7 @@ class TestComponent extends CollectionWidget {
 
 moduleWithoutCsp('render', {
     beforeEach: function() {
+        executeAsyncMock.setup();
         this.element = $('#cmp');
         this.clock = sinon.useFakeTimers();
     },

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js

@@ -9334,6 +9334,7 @@ QUnit.module('Customization of the command columns', {
         setupModule.apply(this, [['adaptivity']]);
     },
     afterEach: function() {
+        teardownModule.apply(this);
         this.dispose && this.dispose();
     }
 }, function() {

packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js

@@ -1144,7 +1144,6 @@ QUnit.module('options changed callbacks', {
 
     },
     afterEach() {
-        executeAsyncMock.teardown();
         fx.off = false;
         this.clock.restore();
     }
@@ -1177,6 +1176,7 @@ QUnit.module('options changed callbacks', {
         const store = new ArrayStore([11, 22]);
         this.instance.option('dataSource', new DataSource(store));
         assert.equal(getImageSources(this.$element), '1122');
+        executeAsyncMock.teardown();
     });
 
     QUnit.test('selectedIndex', function(assert) {

packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js

@@ -27,16 +27,16 @@ QUnit.testStart(function() {
     $('#qunit-fixture').html(markup);
 });
 
-executeAsyncMock.setup();
-
 QUnit.module('popover content size', {
     beforeEach: function() {
         viewPort($('#qunit-fixture').addClass('dx-viewport'));
 
         fx.off = true;
+        executeAsyncMock.setup();
     },
     afterEach: function() {
         fx.off = false;
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('popover content has correct size switch', function(assert) {

packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js

@@ -118,8 +118,6 @@ QUnit.testStart(function() {
     $('#qunit-fixture').html(markup);
 });
 
-executeAsyncMock.setup();
-
 const POPUP_CLASS = 'dx-popup';
 const POPUP_WRAPPER_CLASS = 'dx-popup-wrapper';
 const POPUP_CONTENT_CLASS = 'dx-popup-content';
@@ -144,7 +142,14 @@ const VIEWPORT_CLASS = 'dx-viewport';
 
 const viewport = function() { return $(`.${VIEWPORT_CLASS}`); };
 
-QUnit.module('basic', () => {
+QUnit.module('basic', {
+    beforeEach: function() {
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
+    }
+}, () => {
     QUnit.test('markup init', function(assert) {
         const $element = $('#popup').dxPopup();
         assert.ok($element.hasClass(POPUP_CLASS));
@@ -650,9 +655,11 @@ QUnit.module('basic', () => {
 QUnit.module('dimensions', {
     beforeEach: function() {
         fx.off = true;
+        executeAsyncMock.setup();
     },
     afterEach: function() {
         fx.off = false;
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('content must not overlap bottom buttons', function(assert) {
@@ -932,12 +939,15 @@ QUnit.module('options changed callbacks', {
         };
         this.init();
 
+        executeAsyncMock.setup();
+
         return new Promise((resolve) => themes.initialized(resolve));
     },
 
     afterEach: function() {
         fx.off = false;
         this.clock.restore();
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('width/height', function(assert) {
@@ -2085,6 +2095,11 @@ QUnit.module('drag', {
         };
 
         this.init();
+
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('class should be added if drag is enabled', function(assert) {
@@ -2357,6 +2372,11 @@ QUnit.module('resize', {
         };
 
         this.init();
+
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('popup should have resizable component on overlay content', function(assert) {
@@ -2566,6 +2586,10 @@ QUnit.module('keyboard navigation', {
             this.position = this.$overlayContent.position();
             this.keyboard = keyboardMock(this.$overlayContent);
         };
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('arrows handling', function(assert) {
@@ -2663,7 +2687,11 @@ QUnit.module('rendering', {
         this.element = $('#popup').dxPopup();
         this.instance = this.element.dxPopup('instance');
         devices.current('desktop');
+        executeAsyncMock.setup();
         return new Promise((resolve) => themes.initialized(resolve));
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('anonymous content template rendering', function(assert) {
@@ -2796,7 +2824,14 @@ QUnit.module('rendering', {
     });
 });
 
-QUnit.module('templates', () => {
+QUnit.module('templates', {
+    beforeEach: function() {
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
+    }
+}, () => {
     QUnit.test('titleTemplate', function(assert) {
         assert.expect(6);
 
@@ -3027,6 +3062,10 @@ QUnit.module('renderGeometry', {
 
         this.init();
 
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('toolbar should update geometry after toolbarItems visibility option change', function(assert) {
@@ -3142,6 +3181,10 @@ QUnit.module('positioning', {
             this.init(options);
         };
         this.init();
+        executeAsyncMock.setup();
+    },
+    afterEach: function() {
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.module('after fullScreen option change', () => {
@@ -3530,9 +3573,11 @@ QUnit.module('animation', {
             },
             fullScreen: true,
         }).dxPopup('instance');
+        executeAsyncMock.setup();
     },
     afterEach: function() {
         this.animateStub.restore();
+        executeAsyncMock.teardown();
     }
 }, () => {
     QUnit.test('animation.show.to should have position.of=window if fullScreen=true even if popup position.of is set', function(assert) {

packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js

@@ -96,7 +96,6 @@ module('render', {
         this.clock = sinon.useFakeTimers();
     },
     afterEach: function() {
-        executeAsyncMock.teardown();
         this.clock.restore();
     }
 }, () => {
@@ -538,6 +537,7 @@ module('render', {
         });
 
         assert.equal(this.element.find('.' + EMPTY_MESSAGE_CLASS).length, 0);
+        executeAsyncMock.teardown();
     });
 
     test('No data text message - value', function(assert) {