From e7a10c70ae75c741992afdda60a433be205fd85e Mon Sep 17 00:00:00 2001
From: Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
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/selectmenu/core.js    | 5 +++--
 tests/unit/selectmenu/events.js  | 6 ++++--
 tests/unit/selectmenu/methods.js | 5 +++--
 tests/unit/selectmenu/options.js | 5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'tests/unit/selectmenu')

diff --git a/tests/unit/selectmenu/core.js b/tests/unit/selectmenu/core.js
index b0f56f3b3..0c1c3979a 100644
--- a/tests/unit/selectmenu/core.js
+++ b/tests/unit/selectmenu/core.js
@@ -1,10 +1,11 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/selectmenu"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
-QUnit.module( "selectmenu: core" );
+QUnit.module( "selectmenu: core", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.test( "markup structure", function( assert ) {
 	assert.expect( 7 );
diff --git a/tests/unit/selectmenu/events.js b/tests/unit/selectmenu/events.js
index ffc0429ee..90f40895b 100644
--- a/tests/unit/selectmenu/events.js
+++ b/tests/unit/selectmenu/events.js
@@ -1,13 +1,15 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/selectmenu"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
 QUnit.module( "selectmenu: events", {
 	beforeEach: function() {
 		this.element = $( "#speed" );
-	}
+	},
+	afterEach: helper.moduleAfterEach
 } );
 
 QUnit.test( "change", function( assert ) {
diff --git a/tests/unit/selectmenu/methods.js b/tests/unit/selectmenu/methods.js
index 2722fed01..0785d48ad 100644
--- a/tests/unit/selectmenu/methods.js
+++ b/tests/unit/selectmenu/methods.js
@@ -1,10 +1,11 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/selectmenu"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
-QUnit.module( "selectmenu: methods" );
+QUnit.module( "selectmenu: methods", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.test( "destroy", function( assert ) {
 	assert.expect( 1 );
diff --git a/tests/unit/selectmenu/options.js b/tests/unit/selectmenu/options.js
index 193ea688e..b41f120db 100644
--- a/tests/unit/selectmenu/options.js
+++ b/tests/unit/selectmenu/options.js
@@ -1,10 +1,11 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/selectmenu"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
-QUnit.module( "selectmenu: options" );
+QUnit.module( "selectmenu: options", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.test( "appendTo: null", function( assert ) {
 	assert.expect( 1 );
-- 
cgit v1.2.3