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/dialog/core.js       | 7 ++++---
 tests/unit/dialog/deprecated.js | 5 +++--
 tests/unit/dialog/events.js     | 2 +-
 tests/unit/dialog/methods.js    | 4 +++-
 tests/unit/dialog/options.js    | 5 +++--
 5 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'tests/unit/dialog')

diff --git a/tests/unit/dialog/core.js b/tests/unit/dialog/core.js
index 9e89eaa0f..169734f1c 100644
--- a/tests/unit/dialog/core.js
+++ b/tests/unit/dialog/core.js
@@ -1,11 +1,12 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/dialog"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
-// TODO add teardown callback to remove dialogs
-QUnit.module( "dialog: core" );
+// TODO add afterEach callback to remove dialogs
+QUnit.module( "dialog: core", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.test( "markup structure", function( assert ) {
 	assert.expect( 11 );
diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js
index eac0e123d..ab49fe756 100644
--- a/tests/unit/dialog/deprecated.js
+++ b/tests/unit/dialog/deprecated.js
@@ -1,10 +1,11 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/dialog"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
-QUnit.module( "dialog (deprecated): options" );
+QUnit.module( "dialog (deprecated): options", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.test( "dialogClass", function( assert ) {
 	assert.expect( 5 );
diff --git a/tests/unit/dialog/events.js b/tests/unit/dialog/events.js
index a5030a9f4..a98d1396d 100644
--- a/tests/unit/dialog/events.js
+++ b/tests/unit/dialog/events.js
@@ -5,7 +5,7 @@ define( [
 	"ui/widgets/dialog"
 ], function( QUnit, $, testHelper ) {
 
-QUnit.module( "dialog: events" );
+QUnit.module( "dialog: events", { afterEach: testHelper.moduleAfterEach }  );
 
 QUnit.test( "open", function( assert ) {
 	assert.expect( 13 );
diff --git a/tests/unit/dialog/methods.js b/tests/unit/dialog/methods.js
index a3e63ce7a..e289d81a7 100644
--- a/tests/unit/dialog/methods.js
+++ b/tests/unit/dialog/methods.js
@@ -1,12 +1,14 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"ui/widgets/dialog"
-], function( QUnit, $ ) {
+], function( QUnit, $, helper ) {
 
 QUnit.module( "dialog: methods", {
 	afterEach: function() {
 		$( "body>.ui-dialog" ).remove();
+		return helper.moduleAfterEach.apply( this, arguments );
 	}
 } );
 
diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js
index 4d8e4f717..078d32f8d 100644
--- a/tests/unit/dialog/options.js
+++ b/tests/unit/dialog/options.js
@@ -1,13 +1,14 @@
 define( [
 	"qunit",
 	"jquery",
+	"lib/helper",
 	"./helper",
 	"ui/widgets/dialog",
 	"ui/effects/effect-blind",
 	"ui/effects/effect-explode"
-], function( QUnit, $, testHelper ) {
+], function( QUnit, $, helper, testHelper ) {
 
-QUnit.module( "dialog: options" );
+QUnit.module( "dialog: options", { afterEach: helper.moduleAfterEach }  );
 
 QUnit.test( "appendTo", function( assert ) {
 	assert.expect( 16 );
-- 
cgit v1.2.3