From e7a10c70ae75c741992afdda60a433be205fd85e Mon Sep 17 00:00:00 2001 From: Michał Gołębiowski-Owczarek Date: Sat, 16 May 2020 09:16:24 +0200 Subject: Tests: Ensure no timers are running at the end of each test (#1920) This helps fix issues that make tooltip tests sometimes fail when run against jQuery 3.2 or newer due to timing differences. Details: * Add the `moduleAfterEach` function ensuring no timers are running. * Attach this function via `common.testWidget`. * Attach this function to most test suites. * Add a tooltip test helper cleaning up leftover timers. * Rename legacy `setup`/`teardown` hooks to `beforeEach`/`afterEach`. Closes gh-1920 --- tests/unit/resizable/core.js | 5 +++-- tests/unit/resizable/events.js | 5 +++-- tests/unit/resizable/methods.js | 5 +++-- tests/unit/resizable/options.js | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) (limited to 'tests/unit/resizable') diff --git a/tests/unit/resizable/core.js b/tests/unit/resizable/core.js index 8c58405e3..a2fb60006 100644 --- a/tests/unit/resizable/core.js +++ b/tests/unit/resizable/core.js @@ -1,11 +1,12 @@ define( [ "qunit", "jquery", + "lib/helper", "./helper", "ui/widgets/resizable" -], function( QUnit, $, testHelper ) { +], function( QUnit, $, helper, testHelper ) { -QUnit.module( "resizable: core" ); +QUnit.module( "resizable: core", { afterEach: helper.moduleAfterEach } ); /* Test("element types", function() { diff --git a/tests/unit/resizable/events.js b/tests/unit/resizable/events.js index 4e3968726..3a94d7e52 100644 --- a/tests/unit/resizable/events.js +++ b/tests/unit/resizable/events.js @@ -1,11 +1,12 @@ define( [ "qunit", "jquery", + "lib/helper", "./helper", "ui/widgets/resizable" -], function( QUnit, $, testHelper ) { +], function( QUnit, $, helper, testHelper ) { -QUnit.module( "resizable: events" ); +QUnit.module( "resizable: events", { afterEach: helper.moduleAfterEach } ); QUnit.test( "start", function( assert ) { diff --git a/tests/unit/resizable/methods.js b/tests/unit/resizable/methods.js index 7ee49eee6..8bdc08c11 100644 --- a/tests/unit/resizable/methods.js +++ b/tests/unit/resizable/methods.js @@ -1,10 +1,11 @@ define( [ "qunit", "jquery", + "lib/helper", "ui/widgets/resizable" -], function( QUnit, $ ) { +], function( QUnit, $, helper ) { -QUnit.module( "resizable: methods" ); +QUnit.module( "resizable: methods", { afterEach: helper.moduleAfterEach } ); QUnit.test( "disable", function( assert ) { assert.expect( 5 ); diff --git a/tests/unit/resizable/options.js b/tests/unit/resizable/options.js index 81206abf8..ec5a8c010 100644 --- a/tests/unit/resizable/options.js +++ b/tests/unit/resizable/options.js @@ -1,11 +1,12 @@ define( [ "qunit", "jquery", + "lib/helper", "./helper", "ui/widgets/resizable" -], function( QUnit, $, testHelper ) { +], function( QUnit, $, helper, testHelper ) { -QUnit.module( "resizable: options" ); +QUnit.module( "resizable: options", { afterEach: helper.moduleAfterEach } ); QUnit.test( "alsoResize", function( assert ) { assert.expect( 2 ); -- cgit v1.2.3