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/slider/core.js | 5 +++-- tests/unit/slider/events.js | 5 +++-- tests/unit/slider/methods.js | 5 +++-- tests/unit/slider/options.js | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) (limited to 'tests/unit/slider') diff --git a/tests/unit/slider/core.js b/tests/unit/slider/core.js index 8031367f0..289ddfdd7 100644 --- a/tests/unit/slider/core.js +++ b/tests/unit/slider/core.js @@ -1,8 +1,9 @@ define( [ "qunit", "jquery", + "lib/helper", "ui/widgets/slider" -], function( QUnit, $ ) { +], function( QUnit, $, helper ) { var element, options; @@ -11,7 +12,7 @@ function handle() { } // Slider Tests -QUnit.module( "slider: core" ); +QUnit.module( "slider: core", { afterEach: helper.moduleAfterEach } ); QUnit.test( "markup structure", function( assert ) { assert.expect( 4 ); diff --git a/tests/unit/slider/events.js b/tests/unit/slider/events.js index d0459db64..7250a9ceb 100644 --- a/tests/unit/slider/events.js +++ b/tests/unit/slider/events.js @@ -1,10 +1,11 @@ define( [ "qunit", "jquery", + "lib/helper", "ui/widgets/slider" -], function( QUnit, $ ) { +], function( QUnit, $, helper ) { -QUnit.module( "slider: events" ); +QUnit.module( "slider: events", { afterEach: helper.moduleAfterEach } ); //Specs from http://wiki.jqueryui.com/Slider#specs //"change callback: triggers when the slider has stopped moving and has a new diff --git a/tests/unit/slider/methods.js b/tests/unit/slider/methods.js index ea058cef2..a2685c60d 100644 --- a/tests/unit/slider/methods.js +++ b/tests/unit/slider/methods.js @@ -1,10 +1,11 @@ define( [ "qunit", "jquery", + "lib/helper", "ui/widgets/slider" -], function( QUnit, $ ) { +], function( QUnit, $, helper ) { -QUnit.module( "slider: methods" ); +QUnit.module( "slider: methods", { afterEach: helper.moduleAfterEach } ); QUnit.test( "init", function( assert ) { assert.expect( 5 ); diff --git a/tests/unit/slider/options.js b/tests/unit/slider/options.js index d1eb2b374..e8a9b4208 100644 --- a/tests/unit/slider/options.js +++ b/tests/unit/slider/options.js @@ -1,8 +1,9 @@ define( [ "qunit", "jquery", + "lib/helper", "ui/widgets/slider" -], function( QUnit, $ ) { +], function( QUnit, $, helper ) { var element, options; @@ -10,7 +11,7 @@ function handle() { return element.find( ".ui-slider-handle" ); } -QUnit.module( "slider: options" ); +QUnit.module( "slider: options", { afterEach: helper.moduleAfterEach } ); QUnit.test( "disabled", function( assert ) { assert.expect( 8 ); -- cgit v1.2.3