Tests: Add a tooltip test helper cleaning up leftover timers

Author: mgol

tests/unit/draggable/options.js

@@ -302,6 +302,9 @@ QUnit.test( "connectToSortable, dragging out of a sortable", function( assert )
 		dx: dx,
 		dy: dy
 	} );
+
+	// Cleanup
+	element.stop( true );
 } );
 
 QUnit.test( "connectToSortable, dragging clone into sortable", function( assert ) {

tests/unit/sortable/options.js

@@ -105,6 +105,10 @@ QUnit.test( "#7415: Incorrect revert animation with axis: 'y'", function( assert
 		var top = parseFloat( item.css( "top" ) );
 		assert.equal( item.css( "left" ), expectedLeft, "left not animated" );
 		assert.ok( top > 0 && top < 300, "top is animated" );
+
+		// Cleanup
+		item.stop( true );
+
 		ready();
 	}, 100 );
 } );

tests/unit/tooltip/core.js

@@ -1,11 +1,13 @@
 define( [
 	"qunit",
 	"jquery",
-	"lib/helper",
+	"./helper",
 	"ui/widgets/tooltip"
-], function( QUnit, $, helper ) {
+], function( QUnit, $, testHelper ) {
 
-QUnit.module( "tooltip: core", { afterEach: helper.moduleAfterEach }  );
+var beforeAfterEach = testHelper.beforeAfterEach;
+
+QUnit.module( "tooltip: core", beforeAfterEach() );
 
 QUnit.test( "markup structure", function( assert ) {
 	assert.expect( 7 );

tests/unit/tooltip/deprecated.js

@@ -1,11 +1,13 @@
 define( [
 	"qunit",
 	"jquery",
-	"lib/helper",
+	"./helper",
 	"ui/widgets/tooltip"
-], function( QUnit, $, helper ) {
+], function( QUnit, $, testHelper ) {
 
-QUnit.module( "tooltip: (deprecated) options", { afterEach: helper.moduleAfterEach }  );
+var beforeAfterEach = testHelper.beforeAfterEach;
+
+QUnit.module( "tooltip: (deprecated) options", beforeAfterEach() );
 
 QUnit.test( "tooltipClass", function( assert ) {
 	assert.expect( 1 );

tests/unit/tooltip/events.js

@@ -1,11 +1,13 @@
 define( [
 	"qunit",
 	"jquery",
-	"lib/helper",
+	"./helper",
 	"ui/widgets/tooltip"
-], function( QUnit, $, helper ) {
+], function( QUnit, $, testHelper ) {
 
-QUnit.module( "tooltip: events", { afterEach: helper.moduleAfterEach }  );
+var beforeAfterEach = testHelper.beforeAfterEach;
+
+QUnit.module( "tooltip: events", beforeAfterEach() );
 
 QUnit.test( "programmatic triggers", function( assert ) {
 	assert.expect( 4 );

tests/unit/tooltip/helper.js

@@ -0,0 +1,31 @@
+define( [
+	"qunit",
+	"jquery",
+	"lib/helper",
+	"ui/widgets/tooltip"
+], function( QUnit, $, helper ) {
+
+	return $.extend( helper, {
+		beforeAfterEach: function() {
+			return {
+				afterEach: function() {
+					var index, timer,
+						timers = jQuery.timers;
+
+					jQuery.fx.stop();
+					var x = false;
+
+					for ( index = timers.length; index--; ) {
+						x = true;
+						timer = timers[ index ];
+						timer.anim.stop();
+						timers.splice( index, 1 );
+					}
+
+					return helper.moduleAfterEach.apply( this, arguments );
+				}
+			};
+		}
+	} );
+
+} );

tests/unit/tooltip/methods.js

@@ -1,16 +1,13 @@
 define( [
 	"qunit",
 	"jquery",
-	"lib/helper",
+	"./helper",
 	"ui/widgets/tooltip"
-], function( QUnit, $, helper ) {
+], function( QUnit, $, testHelper ) {
 
-QUnit.module( "tooltip: methods", {
-	afterEach: function() {
-		jQuery.fx.stop();
-		return helper.moduleAfterEach.apply( this, arguments );
-	}
-} );
+var beforeAfterEach = testHelper.beforeAfterEach;
+
+QUnit.module( "tooltip: methods", beforeAfterEach() );
 
 QUnit.test( "destroy", function( assert ) {
 	assert.expect( 3 );

tests/unit/tooltip/options.js

@@ -1,11 +1,13 @@
 define( [
 	"qunit",
 	"jquery",
-	"lib/helper",
+	"./helper",
 	"ui/widgets/tooltip"
-], function( QUnit, $, helper ) {
+], function( QUnit, $, testHelper ) {
 
-QUnit.module( "tooltip: options", { afterEach: helper.moduleAfterEach }  );
+var beforeAfterEach = testHelper.beforeAfterEach;
+
+QUnit.module( "tooltip: options", beforeAfterEach() );
 
 QUnit.test( "disabled: true", function( assert ) {
 	assert.expect( 1 );