From b994f4ec85330f534380e165d6989a2641d321e2 Mon Sep 17 00:00:00 2001
From: Oleg Gaidarenko <markelog@gmail.com>
Date: Tue, 22 Dec 2015 16:00:15 +0300
Subject: [PATCH] Revert "CSS: Ignore the CSS cascade in show()/hide()/etc."

This reverts commit 9df8bd205ab78308c34af70c934c42175e560e86.
---
 src/css.js                |   61 +-
 src/css/defaultDisplay.js |   71 ++
 src/effects.js            |  186 ++--
 test/.jshintrc            |   22 +-
 test/data/testrunner.js   |    2 +-
 test/data/testsuite.css   |   12 +-
 test/unit/css.js          |  226 ++--
 test/unit/dimensions.js   |   21 +-
 test/unit/effects.js      | 2090 +++++++++++++++++--------------------
 test/unit/ready.js        |    2 +-
 10 files changed, 1352 insertions(+), 1341 deletions(-)
 create mode 100644 src/css/defaultDisplay.js

diff --git a/src/css.js b/src/css.js
index 66e4d52d3..9f69a1a42 100644
--- a/src/css.js
+++ b/src/css.js
@@ -11,15 +11,17 @@ define( [
 	"./css/var/swap",
 	"./css/curCSS",
 	"./css/adjustCSS",
+	"./css/defaultDisplay",
 	"./css/addGetHookIf",
 	"./css/support",
-	"./css/showHide",
 
 	"./core/init",
 	"./core/ready",
 	"./selector" // contains
 ], function( jQuery, pnum, access, rmargin, document, rcssNum, rnumnonpx, cssExpand,
-	isHidden, swap, curCSS, adjustCSS, addGetHookIf, support, showHide ) {
+	isHidden, swap, curCSS, adjustCSS, defaultDisplay, addGetHookIf, support ) {
+
+	console.log(isHidden);
 
 var
 
@@ -67,6 +69,61 @@ function vendorPropName( name ) {
 	}
 }
 
+function showHide( elements, show ) {
+	var display, elem, hidden,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		values[ index ] = jQuery._data( elem, "olddisplay" );
+		display = elem.style.display;
+		if ( show ) {
+			// Reset the inline display of this element to learn if it is
+			// being hidden by cascaded rules or not
+			if ( !values[ index ] && display === "none" ) {
+				elem.style.display = "";
+			}
+
+			// Set elements which have been overridden with display: none
+			// in a stylesheet to whatever the default browser style is
+			// for such an element
+			if ( elem.style.display === "" && isHidden( elem ) ) {
+				values[ index ] = jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+			}
+		} else {
+			hidden = isHidden( elem );
+
+			if ( display && display !== "none" || !hidden ) {
+				jQuery._data(
+					elem,
+					"olddisplay",
+					hidden ? display : jQuery.css( elem, "display" )
+				);
+			}
+		}
+	}
+
+	// Set the display of most of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
+			elem.style.display = show ? values[ index ] || "" : "none";
+		}
+	}
+
+	return elements;
+}
+
 function setPositiveNumber( elem, value, subtract ) {
 	var matches = rnumsplit.exec( value );
 	return matches ?
diff --git a/src/css/defaultDisplay.js b/src/css/defaultDisplay.js
new file mode 100644
index 000000000..3771be6d1
--- /dev/null
+++ b/src/css/defaultDisplay.js
@@ -0,0 +1,71 @@
+define([
+	"../core",
+	"../var/document",
+	"../manipulation" // appendTo
+], function( jQuery, document ) {
+
+var iframe,
+	elemdisplay = {
+
+		// Support: Firefox
+		// We have to pre-define these values for FF (#10227)
+		HTML: "block",
+		BODY: "block"
+	};
+
+/**
+ * Retrieve the actual display of a element
+ * @param {String} name nodeName of the element
+ * @param {Object} doc Document object
+ */
+// Called only from within defaultDisplay
+function actualDisplay( name, doc ) {
+	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
+
+		display = jQuery.css( elem[ 0 ], "display" );
+
+	// We don't have any data stored on the element,
+	// so use "detach" method as fast way to get rid of the element
+	elem.detach();
+
+	return display;
+}
+
+/**
+ * Try to determine the default display value of an element
+ * @param {String} nodeName
+ */
+function defaultDisplay( nodeName ) {
+	var doc = document,
+		display = elemdisplay[ nodeName ];
+
+	if ( !display ) {
+		display = actualDisplay( nodeName, doc );
+
+		// If the simple way fails, read from inside an iframe
+		if ( display === "none" || !display ) {
+
+			// Use the already-created iframe if possible
+			iframe = (iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ))
+				.appendTo( doc.documentElement );
+
+			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+			doc = iframe[ 0 ].contentDocument;
+
+			// Support: IE
+			doc.write();
+			doc.close();
+
+			display = actualDisplay( nodeName, doc );
+			iframe.detach();
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return display;
+}
+
+return defaultDisplay;
+});
diff --git a/src/effects.js b/src/effects.js
index b4cd34532..2e6cf2529 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -5,19 +5,17 @@ define( [
 	"./var/rnotwhite",
 	"./css/var/cssExpand",
 	"./css/var/isHidden",
-	"./css/var/swap",
 	"./css/adjustCSS",
-	"./css/showHide",
+	"./css/defaultDisplay",
+	"./var/document",
 
 	"./core/init",
+	"./effects/Tween",
 	"./queue",
-	"./deferred",
-	"./traversing",
-	"./manipulation",
 	"./css",
-	"./effects/Tween"
-], function( jQuery, document, rcssNum, rnotwhite, cssExpand, isHidden, swap,
-	adjustCSS, showHide ) {
+	"./deferred",
+	"./traversing"
+], function( jQuery, document, rcssNum, rnotwhite, cssExpand, isHidden, adjustCSS, defaultDisplay ) {
 
 var
 	fxNow, timerId,
@@ -76,15 +74,14 @@ function createTween( value, prop, animation ) {
 
 function defaultPrefilter( elem, props, opts ) {
 	/* jshint validthis: true */
-	var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display,
-		isBox = "width" in props || "height" in props,
+	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
 		anim = this,
 		orig = {},
 		style = elem.style,
 		hidden = elem.nodeType && isHidden( elem ),
 		dataShow = jQuery._data( elem, "fxshow" );
 
-	// Queue-skipping animations hijack the fx hooks
+	// handle queue: false promises
 	if ( !opts.queue ) {
 		hooks = jQuery._queueHooks( elem, "fx" );
 		if ( hooks.unqueued == null ) {
@@ -111,70 +108,24 @@ function defaultPrefilter( elem, props, opts ) {
 		} );
 	}
 
-	// Detect show/hide animations
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.test( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// Pretend to be hidden if this is a "show" and
-				// there is still data from a stopped show/hide
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-
-				// Ignore all other no-op show/hide data
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
-
-	// Bail out if this is a no-op like .hide().hide()
-	propTween = !jQuery.isEmptyObject( props );
-	if ( !propTween && jQuery.isEmptyObject( orig ) ) {
-		return;
-	}
-
-	// Restrict "overflow" and "display" styles during box animations
-	if ( isBox && elem.nodeType === 1 ) {
-
-		// Support: IE 9 - 11
-		// Record all 3 overflow attributes because IE does not infer the shorthand
-		// from identically-valued overflowX and overflowY
+	// height/width overflow pass
+	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
+		// Make sure that nothing sneaks out
+		// Record all 3 overflow attributes because IE does not
+		// change the overflow attribute when overflowX and
+		// overflowY are set to the same value
 		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
 
-		// Identify a display type, preferring old show/hide data over the CSS cascade
-		restoreDisplay = dataShow && dataShow.display;
-		if ( restoreDisplay == null ) {
-			restoreDisplay = jQuery._data( elem, "display" );
-		}
+		// Set display property to inline-block for height/width
+		// animations on inline elements that are having width/height animated
 		display = jQuery.css( elem, "display" );
-		if ( display === "none" ) {
-			display = restoreDisplay || swap( elem, { "display": "" }, function() {
-				return jQuery.css( elem, "display" );
-			} );
-		}
 
-		// Animate inline elements as inline-block
-		if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) {
-			if ( jQuery.css( elem, "float" ) === "none" ) {
-
-				// Restore the original display value at the end of pure show/hide animations
-				if ( !propTween ) {
-					anim.done( function() {
-						style.display = restoreDisplay;
-					} );
-					if ( restoreDisplay == null ) {
-						display = style.display;
-						restoreDisplay = display === "none" ? "" : display;
-					}
-				}
-				style.display = "inline-block";
-			}
+		// Test default display if display is currently "none"
+		checkDisplay = display === "none" ?
+			jQuery._data( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
+
+		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
+			style.display = "inline-block";
 		}
 	}
 
@@ -187,53 +138,72 @@ function defaultPrefilter( elem, props, opts ) {
 		} );
 	}
 
-	// Implement show/hide animations
-	propTween = false;
-	for ( prop in orig ) {
+	// show/hide pass
+	for ( prop in props ) {
+		value = props[ prop ];
+		if ( rfxtypes.exec( value ) ) {
+			delete props[ prop ];
+			toggle = toggle || value === "toggle";
+			if ( value === ( hidden ? "hide" : "show" ) ) {
 
-		// General show/hide setup for this element animation
-		if ( !propTween ) {
-			if ( dataShow ) {
-				if ( "hidden" in dataShow ) {
-					hidden = dataShow.hidden;
+				// If there is dataShow left over from a stopped hide or show
+				// and we are going to proceed with show, we should pretend to be hidden
+				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
+					hidden = true;
+				} else {
+					continue;
 				}
-			} else {
-				dataShow = jQuery._data( elem, "fxshow", { display: restoreDisplay } );
 			}
+			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
 
-			// Store hidden/visible for toggle so `.stop().toggle()` "reverses"
-			if ( toggle ) {
-				dataShow.hidden = !hidden;
-			}
+		// Any non-fx value stops us from restoring the original display value
+		} else {
+			display = undefined;
+		}
+	}
 
-			// Show elements before animating them
-			if ( hidden ) {
-				showHide( [ elem ], true );
+	if ( !jQuery.isEmptyObject( orig ) ) {
+		if ( dataShow ) {
+			if ( "hidden" in dataShow ) {
+				hidden = dataShow.hidden;
 			}
-
-			/* jshint -W083 */
-			anim.done( function() {
-
-				// The final step of a "hide" animation is actually hiding the element
-				if ( !hidden ) {
-					showHide( [ elem ] );
-				}
-				jQuery._removeData( elem, "fxshow" );
-				for ( prop in orig ) {
-					jQuery.style( elem, prop, orig[ prop ] );
-				}
-			} );
+		} else {
+			dataShow = jQuery._data( elem, "fxshow", {} );
 		}
 
-		// Per-property setup
-		propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-		if ( !( prop in dataShow ) ) {
-			dataShow[ prop ] = propTween.start;
-			if ( hidden ) {
-				propTween.end = propTween.start;
-				propTween.start = prop === "width" || prop === "height" ? 1 : 0;
+		// store state if its toggle - enables .stop().toggle() to "reverse"
+		if ( toggle ) {
+			dataShow.hidden = !hidden;
+		}
+		if ( hidden ) {
+			jQuery( elem ).show();
+		} else {
+			anim.done(function() {
+				jQuery( elem ).hide();
+			});
+		}
+		anim.done(function() {
+			var prop;
+			jQuery._removeData( elem, "fxshow" );
+			for ( prop in orig ) {
+				jQuery.style( elem, prop, orig[ prop ] );
+			}
+		});
+		for ( prop in orig ) {
+			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
+
+			if ( !( prop in dataShow ) ) {
+				dataShow[ prop ] = tween.start;
+				if ( hidden ) {
+					tween.end = tween.start;
+					tween.start = prop === "width" || prop === "height" ? 1 : 0;
+				}
 			}
 		}
+
+	// If this is a noop like .hide().hide(), restore an overwritten display value
+	} else if ( (display === "none" ? defaultDisplay( elem.nodeName ) : display) === "inline" ) {
+		style.display = display;
 	}
 }
 
diff --git a/test/.jshintrc b/test/.jshintrc
index 13e9ff62c..72138c422 100644
--- a/test/.jshintrc
+++ b/test/.jshintrc
@@ -1,3 +1,4 @@
+
 {
 	"boss": true,
 	"curly": true,
@@ -22,10 +23,18 @@
 		"require": false,
 		"define": false,
 		"DOMParser": false,
-		"JSON": false,
-		"Promise": false,
-		"Symbol": false,
 		"QUnit": false,
+		"ok": false,
+		"equal": false,
+		"asyncTest": false,
+		"notEqual": false,
+		"deepEqual": false,
+		"strictEqual": false,
+		"notStrictEqual": false,
+		"start": false,
+		"stop": false,
+		"expect": false,
+		"throws": false,
 		"ajaxTest": false,
 		"testIframe": false,
 		"testIframeWithCallback": false,
@@ -37,11 +46,14 @@
 		"url": false,
 		"t": false,
 		"q": false,
-		"equal": true,
-		"expect": true,
+		"Promise": true,
+		"JSON": true,
+		"Symbol": true,
 
 		"jQuery": true,
 		"sinon": true,
+		"module": true,
+		"test": true,
 		"amdDefined": true,
 		"fireNative": true,
 		"Globals": true,
diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index 0758219f0..a6f716a7d 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -43,7 +43,7 @@ function keys( o ) {
  * @param {jQuery|HTMLElement|Object|Array} elems Target (or array of targets) for jQuery.data.
  * @param {string} key
  */
-QUnit.assert.expectJqData = function( env, elems, key ) {
+QUnit.expectJqData = QUnit.assert.expectJqData = function( env, elems, key ) {
 	var i, elem, expando;
 
 	// As of jQuery 2.0, there will be no "cache"-data is
diff --git a/test/data/testsuite.css b/test/data/testsuite.css
index eb8ab0155..9f80473d8 100644
--- a/test/data/testsuite.css
+++ b/test/data/testsuite.css
@@ -76,8 +76,7 @@ div.noopacity {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(opacity=0)";
 }
 
-div.hidden,
-span.hidden {
+div.hidden {
 	display: none;
 }
 
@@ -125,6 +124,10 @@ div#fx-tests div.noback {
 	display: none;
 }
 
+/* tests to ensure jQuery can determine the native display mode of elements
+   that have been set as display: none in stylesheets */
+div#show-tests * { display: none; }
+
 #nothiddendiv { font-size: 16px; }
 #nothiddendivchild.em { font-size: 2em; }
 #nothiddendivchild.prct { font-size: 150%; }
@@ -132,6 +135,11 @@ div#fx-tests div.noback {
 /* For testing type on vml in IE #7071 */
 v\:oval { behavior:url(#default#VML); display:inline-block; }
 
+/* 8099 changes to default styles are read correctly */
+tt { display: none; }
+sup { display: none; }
+dfn { display: none; }
+
 /* #9239 Attach a background to the body( avoid crashes in removing the test element in support ) */
 body, div { background: url(http://static.jquery.com/files/rocker/images/logo_jquery_215x53.gif) no-repeat -1000px 0; }
 
diff --git a/test/unit/css.js b/test/unit/css.js
index 7943b6717..b15f2c76d 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -527,14 +527,14 @@ QUnit.test( "show(); hide()", function( assert ) {
 
 	hiddendiv = jQuery( "div.hidden" );
 	hiddendiv.hide();
-	assert.equal( hiddendiv.css( "display" ), "none", "Cascade-hidden div after hide()" );
+	equal( hiddendiv.css("display"), "none", "Non-detached div hidden" );
 	hiddendiv.show();
-	assert.equal( hiddendiv.css( "display" ), "none", "Show does not trump CSS cascade" );
+	equal( hiddendiv.css("display"), "block", "Pre-hidden div shown" );
 
-	div = jQuery( "<div>" ).hide();
-	assert.equal( div.css( "display" ), "none", "Detached div hidden" );
-	div.appendTo( "#qunit-fixture" ).show();
-	assert.equal( div.css( "display" ), "block", "Initially-detached div after show()" );
+	div = jQuery("<div>").hide();
+	equal( div.css("display"), "none", "Detached div hidden" );
+	div.appendTo("#qunit-fixture").show();
+	equal( div.css("display"), "block", "Pre-hidden div shown" );
 
 } );
 
@@ -543,7 +543,7 @@ QUnit.test( "show();", function( assert ) {
 	assert.expect( 18 );
 
 	var hiddendiv, div, pass, test;
-		hiddendiv = jQuery( "div.hidden" );
+	hiddendiv = jQuery("div.hidden");
 
 	assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "none", "hiddendiv is display: none" );
 
@@ -564,15 +564,8 @@ QUnit.test( "show();", function( assert ) {
 	} );
 	assert.ok( pass, "Show" );
 
-	jQuery(
-		"<div id='show-tests'>" +
-		"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
-		"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
-		"<ul><li></li></ul></div>" +
-		"<table id='test-table'></table>"
-	).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );
-
-	jQuery( "#test-table" ).remove();
+	// #show-tests * is set display: none in CSS
+	jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>");
 
 	test = {
 		"div": "block",
@@ -601,88 +594,136 @@ QUnit.test( "show();", function( assert ) {
 	jQuery( "<div>test</div> text <span>test</span>" ).hide().remove();
 } );
 
+test("show() resolves correct default display #8099", function() {
+	expect(7);
+	var tt8099 = jQuery("<tt/>").appendTo("body"),
+			dfn8099 = jQuery("<dfn/>", { "html": "foo"}).appendTo("body");
+
+	equal( tt8099.css("display"), "none", "default display override for all tt" );
+	equal( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	equal( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
+
+	equal( tt8099.hide().css("display"), "none", "default display override for all tt" );
+	equal( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	equal( dfn8099.css("display"), "none", "default display override for all dfn" );
+	equal( dfn8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+	tt8099.remove();
+	dfn8099.remove();
+});
+
 QUnit.test( "show() resolves correct default display for detached nodes", function( assert ) {
-	assert.expect( 16 );
+	assert.expect( 13 );
+
+	var div, span, tr, trDisplay;
+
+	div = jQuery("<div class='hidden'>");
+	div.show().appendTo("#qunit-fixture");
+	equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through stylesheets ) div is visible." );
 
-	var div, span, tr;
+	div = jQuery("<div style='display: none'>");
+	div.show().appendTo("#qunit-fixture");
+	equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through inline style ) div is visible." );
 
-	div = jQuery( "<div class='hidden'>" );
-	div.show().appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "none",
-		"A shown-while-detached div can be hidden by the CSS cascade" );
+	span = jQuery("<span class='hidden'/>");
+	span.show().appendTo("#qunit-fixture");
+	equal( span.css("display"), "inline", "Make sure a detached, pre-hidden( through stylesheets ) span has default display." );
 
-	div = jQuery( "<div><div class='hidden'></div></div>" ).children( "div" );
-	div.show().appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "none",
-		"A shown-while-detached div inside a visible div can be hidden by the CSS cascade" );
+	span = jQuery("<span style='display: inline'/>");
+	span.show().appendTo("#qunit-fixture");
+	equal( span.css("display"), "inline", "Make sure a detached, pre-hidden( through inline style ) span has default display." );
 
-	span = jQuery( "<span class='hidden'/>" );
-	span.show().appendTo( "#qunit-fixture" );
-	assert.equal( span.css( "display" ), "none",
-		"A shown-while-detached span can be hidden by the CSS cascade" );
+	div = jQuery("<div><div class='hidden'></div></div>").children("div");
+	div.show().appendTo("#qunit-fixture");
+	equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through stylesheets ) div inside another visible div is visible." );
+
+	div = jQuery("<div><div style='display: none'></div></div>").children("div");
+	div.show().appendTo("#qunit-fixture");
+	equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through inline style ) div inside another visible div is visible." );
 
 	div = jQuery( "div.hidden" );
 	div.detach().show();
-	assert.ok( !div[ 0 ].style.display,
-		"show() does not update inline style of a cascade-hidden-before-detach div" );
-	div.appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "none",
-		"A shown-while-detached cascade-hidden div is hidden after attachment" );
+
+	equal( div.css("display"), "block", "Make sure a detached( through detach() ), pre-hidden div is visible." );
 	div.remove();
 
-	span = jQuery( "<span class='hidden'/>" );
-	span.appendTo( "#qunit-fixture" ).detach().show().appendTo( "#qunit-fixture" );
-	assert.equal( span.css( "display" ), "none",
-		"A shown-while-detached cascade-hidden span is hidden after attachment" );
+	span = jQuery("<span>");
+	span.appendTo("#qunit-fixture").detach().show().appendTo("#qunit-fixture" );
+	equal( span.css("display"), "inline", "Make sure a detached( through detach() ), pre-hidden span has default display." );
 	span.remove();
 
-	div = jQuery( document.createElement( "div" ) );
-	div.show().appendTo( "#qunit-fixture" );
-	assert.ok( !div[ 0 ].style.display, "A shown-while-detached div has no inline style" );
-	assert.equal( div.css( "display" ), "block",
-		"A shown-while-detached div has default display after attachment" );
+	div = jQuery("<div>");
+	div.show().appendTo("#qunit-fixture");
+	ok( !!div.get( 0 ).style.display, "Make sure not hidden div has a inline style." );
 	div.remove();
 
-	div = jQuery( "<div style='display: none'>" );
-	div.show();
-	assert.equal( div[ 0 ].style.display, "",
-		"show() updates inline style of a detached inline-hidden div" );
-	div.appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "block",
-		"A shown-while-detached inline-hidden div has default display after attachment" );
-
-	div = jQuery( "<div><div style='display: none'></div></div>" ).children( "div" );
-	div.show().appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "block",
-		"A shown-while-detached inline-hidden div inside a visible div has default display " +
-		"after attachment" );
-
-	span = jQuery( "<span style='display: none'/>" );
-	span.show();
-	assert.equal( span[ 0 ].style.display, "",
-		"show() updates inline style of a detached inline-hidden span" );
-	span.appendTo( "#qunit-fixture" );
-	assert.equal( span.css( "display" ), "inline",
-		"A shown-while-detached inline-hidden span has default display after attachment" );
-
-	div = jQuery( "<div style='display: inline'/>" );
-	div.show().appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "inline",
-		"show() does not update inline style of a detached inline-visible div" );
+	div = jQuery( document.createElement("div") );
+	div.show().appendTo("#qunit-fixture");
+	equal( div.css("display"), "block", "Make sure a pre-created element has default display." );
 	div.remove();
 
-	tr = jQuery( "<tr/>" );
-	jQuery( "#table" ).append( tr );
+	div = jQuery("<div style='display: inline'/>");
+	div.show().appendTo("#qunit-fixture");
+	equal( div.css("display"), "inline", "Make sure that element has same display when it was created." );
+	div.remove();
+
+	tr = jQuery("<tr/>");
+	jQuery("#table").append( tr );
+	trDisplay = tr.css( "display" );
 	tr.detach().hide().show();
 
-	assert.ok( !tr[ 0 ].style.display, "Not-hidden detached tr elements have no inline style" );
+	equal( tr[ 0 ].style.display, trDisplay, "For detached tr elements, display should always be like for attached trs" );
 	tr.remove();
 
-	span = jQuery( "<span/>" ).hide().show();
-	assert.ok( !span[ 0 ].style.display, "Not-hidden detached span elements have no inline style" );
+	span = jQuery("<span/>").hide().show();
+	equal( span[ 0 ].style.display, "inline", "For detached span elements, display should always be inline" );
 	span.remove();
 } );
 
+test("show() resolves correct default display #10227", 4, function() {
+	var htmlDisplay,
+		html = jQuery( document.documentElement ),
+		body = jQuery( "body" );
+
+	body.append( "<p class='ddisplay'>a<style>body{display:none}</style></p>" );
+
+	equal( body.css("display"), "none", "Initial display for body element: none" );
+
+	body.show();
+	equal( body.css("display"), "block", "Correct display for body element: block" );
+
+	body.append( "<p class='ddisplay'>a<style>html{display:none}</style></p>" );
+
+	equal( html.css("display"), "none", "Initial display for html element: none" );
+
+	html.show();
+	htmlDisplay = html.css( "display" );
+
+	// Check for "inline" value needed for older browsers
+	ok( "inline" === htmlDisplay || "block" === htmlDisplay, "Correct display for html element" );
+
+	jQuery._removeData( body[ 0 ] );
+	jQuery._removeData( html[ 0 ] );
+	jQuery( ".ddisplay" ).remove();
+});
+
+test("show() resolves correct default display when iframe display:none #12904", function() {
+	expect(2);
+
+	var ddisplay = jQuery(
+		"<p id='ddisplay'>a<style>p{display:none}iframe{display:none !important}</style></p>"
+	).appendTo("body");
+
+	equal( ddisplay.css("display"), "none", "Initial display: none" );
+
+	ddisplay.show();
+	equal( ddisplay.css("display"), "block", "Correct display: block" );
+
+	ddisplay.remove();
+});
+
 QUnit.test( "toggle()", function( assert ) {
 	assert.expect( 9 );
 	var div, oldHide,
@@ -722,7 +763,7 @@ QUnit.test( "hide hidden elements (bug #7141)", function( assert ) {
 	var div = jQuery( "<div style='display:none'></div>" ).appendTo( "#qunit-fixture" );
 	assert.equal( div.css( "display" ), "none", "Element is hidden by default" );
 	div.hide();
-	assert.ok( !jQuery._data( div, "display" ), "display data is undefined after hiding an already-hidden element" );
+	ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
 	div.show();
 	assert.equal( div.css( "display" ), "block", "Show a double-hidden element" );
 
@@ -1168,6 +1209,39 @@ QUnit.test( "show() after hide() should always set display to initial value (#14
 	assert.equal( div.css( "display" ), "list-item", "should get last set display value" );
 } );
 
+asyncTest( "Make sure initialized display value for disconnected nodes is correct (#13310)", 4, function() {
+	var display = jQuery("#display").css("display"),
+		div = jQuery("<div/>");
+
+	equal( div.css( "display", "inline" ).hide().show().appendTo("body").css( "display" ), "inline", "Initialized display value has returned" );
+	div.remove();
+
+	div.css( "display", "none" ).hide();
+	equal( jQuery._data( div[ 0 ], "olddisplay" ), undefined, "olddisplay is undefined after hiding a detached and hidden element" );
+	div.remove();
+
+	div.css( "display", "inline-block" ).hide().appendTo("body").fadeIn(function() {
+		equal( div.css( "display" ), "inline-block", "Initialized display value has returned" );
+		div.remove();
+
+		start();
+	});
+
+	equal( jQuery._data( jQuery("#display").css( "display", "inline" ).hide()[ 0 ], "olddisplay" ), display,
+	"display: * !Important value should used as initialized display" );
+	jQuery._removeData( jQuery("#display")[ 0 ] );
+});
+
+QUnit.test( "show() after hide() should always set display to initial value (#14750)", 1, function( assert ) {
+	var div = jQuery( "<div />" ),
+		fixture = jQuery( "#qunit-fixture" );
+
+	fixture.append( div );
+
+	div.css( "display", "inline" ).hide().show().css( "display", "list-item" ).hide().show();
+	assert.equal( div.css( "display" ), "list-item", "should get last set display value" );
+} );
+
 // Support: IE < 11
 // We have to jump through the hoops here in order to test work with "order" CSS property,
 // that some browsers do not support. This test is not, strictly speaking, correct,
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 8a4f0d431..17f133dce 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -57,7 +57,7 @@ function testWidth( val, assert ) {
 
 	assert.equal( jQuery( window ).width(), document.documentElement.clientWidth, "Window width is equal to width reported by window/document." );
 
-	assert.expectJqData( this, $div[ 0 ], "display" );
+	QUnit.expectJqData( this, $div[0], "olddisplay" );
 }
 
 QUnit.test( "width()", function( assert ) {
@@ -110,7 +110,7 @@ function testHeight( val, assert ) {
 
 	assert.equal( jQuery( window ).height(), document.documentElement.clientHeight, "Window width is equal to width reported by window/document." );
 
-	assert.expectJqData( this, $div[ 0 ], "display" );
+	QUnit.expectJqData( this, $div[0], "olddisplay" );
 }
 
 QUnit.test( "height()", function( assert ) {
@@ -165,8 +165,9 @@ QUnit.test( "innerWidth()", function( assert ) {
 	assert.equal( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
-	assert.expectJqData( this, $div[ 0 ], "display" );
-} );
+
+	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
+});
 
 QUnit.test( "innerHeight()", function( assert ) {
 	assert.expect( 6 );
@@ -200,8 +201,8 @@ QUnit.test( "innerHeight()", function( assert ) {
 	assert.equal( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
-	assert.expectJqData( this, $div[ 0 ], "display" );
-} );
+	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
+});
 
 QUnit.test( "outerWidth()", function( assert ) {
 	assert.expect( 11 );
@@ -239,8 +240,8 @@ QUnit.test( "outerWidth()", function( assert ) {
 	assert.equal( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
-	assert.expectJqData( this, $div[ 0 ], "display" );
-} );
+	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
+});
 
 QUnit.test( "child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height()  see #9441 #9300", function( assert ) {
 	assert.expect( 16 );
@@ -387,8 +388,8 @@ QUnit.test( "outerHeight()", function( assert ) {
 	assert.equal( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
-	assert.expectJqData( this, $div[ 0 ], "display" );
-} );
+	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
+});
 
 QUnit.test( "passing undefined is a setter #5571", function( assert ) {
 	assert.expect( 4 );
diff --git a/test/unit/effects.js b/test/unit/effects.js
index e3dc0e462..9f4dcea1d 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1,4 +1,4 @@
-( function() {
+(function() {
 
 // Can't test what ain't there
 if ( !jQuery.fx ) {
@@ -7,64 +7,67 @@ if ( !jQuery.fx ) {
 
 var oldRaf = window.requestAnimationFrame;
 
-QUnit.module( "effects", {
+module("effects", {
 	setup: function() {
 		window.requestAnimationFrame = null;
-		this.sandbox = sinon.sandbox.create();
-		this.clock = this.sandbox.useFakeTimers( 505877050 );
+		this.clock = sinon.useFakeTimers( 505877050 );
 		this._oldInterval = jQuery.fx.interval;
-		jQuery.fx.step = {};
 		jQuery.fx.interval = 10;
 	},
 	teardown: function() {
-		this.sandbox.restore();
+		this.clock.restore();
 		jQuery.fx.stop();
 		jQuery.fx.interval = this._oldInterval;
 		window.requestAnimationFrame = oldRaf;
 		return moduleTeardown.apply( this, arguments );
 	}
-} );
+});
 
 QUnit.test( "sanity check", function( assert ) {
 	assert.expect( 1 );
 	assert.equal( jQuery( "#dl:visible, #qunit-fixture:visible, #foo:visible" ).length, 3, "QUnit state is correct for testing effects" );
 } );
 
-QUnit.test( "show() basic", function( assert ) {
-	assert.expect( 1 );
+test("show() basic", 2, function() {
+	var div,
+		hiddendiv = jQuery("div.hidden");
+
+	hiddendiv.hide().show();
 
-	var div = jQuery( "<div>" ).hide().appendTo( "#qunit-fixture" ).show();
+	equal( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );
 
-	assert.equal( div.css( "display" ), "block", "Make sure pre-hidden divs show" );
+	div = jQuery("<div>").hide().appendTo("#qunit-fixture").show();
+
+	equal( div.css("display"), "block", "Make sure pre-hidden divs show" );
 
 	// Clean up the detached node
 	div.remove();
-} );
 
-QUnit.test( "show()", function( assert ) {
-	assert.expect( 27 );
+	QUnit.expectJqData( this, hiddendiv, "olddisplay" );
+});
 
+test("show()", 27, function () {
 	var div, speeds, test,
 		displaysActual, displaysExpected,
-		hiddendiv = jQuery( "div.hidden" );
+		hiddendiv = jQuery("div.hidden");
 
-	assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "none", "hiddendiv is display: none" );
+	equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");
 
-	hiddendiv.css( "display", "block" );
-	assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "block", "hiddendiv is display: block" );
+	hiddendiv.css("display", "block");
+	equal(jQuery.css( hiddendiv[0], "display"), "block", "hiddendiv is display: block");
 
 	hiddendiv.show();
-	assert.equal( jQuery.css( hiddendiv[ 0 ], "display" ), "block", "hiddendiv is display: block" );
+	equal(jQuery.css( hiddendiv[0], "display"), "block", "hiddendiv is display: block");
 
-	hiddendiv.css( "display", "" );
+	hiddendiv.css("display","");
 
 	displaysActual = [];
 	displaysExpected = [];
 
-	div = jQuery( "#fx-queue div" ).slice( 0, 4 );
-	div.show().each( function() {
-		assert.notEqual( this.style.display, "none", "don't change any <div> with display block" );
-	} );
+	div = jQuery("#fx-queue div").slice(0, 4);
+	div.show().each(function() {
+		notEqual(this.style.display, "none", "don't change any <div> with display block");
+	});
 
 	speeds = {
 		"null speed": null,
@@ -72,370 +75,341 @@ QUnit.test( "show()", function( assert ) {
 		"false speed": false
 	};
 
-	jQuery.each( speeds, function( name, speed ) {
+	jQuery.each(speeds, function(name, speed) {
 		var pass = true;
-		div.hide().show( speed ).each( function() {
+		div.hide().show(speed).each(function() {
 			if ( this.style.display === "none" ) {
 				pass = false;
 			}
-		} );
-		assert.ok( pass, "Show with " + name );
-	} );
+		});
+		ok( pass, "Show with " + name);
+	});
 
-	jQuery.each( speeds, function( name, speed ) {
+	jQuery.each(speeds, function(name, speed) {
 		var pass = true;
-		div.hide().show( speed, function() {
+		div.hide().show(speed, function() {
 			pass = false;
-		} );
-		assert.ok( pass, "Show with " + name + " does not call animate callback" );
-	} );
+		});
+		ok( pass, "Show with " + name + " does not call animate callback" );
+	});
 
 	// Tolerate data from show()/hide()
-	assert.expectJqData( this, div, "display" );
-
-	jQuery(
-		"<div id='show-tests'>" +
-		"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
-		"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
-		"<ul><li></li></ul></div>" +
-		"<table id='test-table'></table>"
-	).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );
+	QUnit.expectJqData( this, div, "olddisplay" );
 
-	jQuery( "#test-table" ).remove();
+	// #show-tests * is set display: none in CSS
+	jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>");
 
 	test = {
-		"div": "block",
-		"p": "block",
-		"a": "inline",
-		"code": "inline",
-		"pre": "block",
-		"span": "inline",
-		"table": "table",
-		"thead": "table-header-group",
-		"tbody": "table-row-group",
-		"tr": "table-row",
-		"th": "table-cell",
-		"td": "table-cell",
-		"ul": "block",
-		"li": "list-item"
+		"div"      : "block",
+		"p"        : "block",
+		"a"        : "inline",
+		"code"     : "inline",
+		"pre"      : "block",
+		"span"     : "inline",
+		"table"    : "table",
+		"thead"    : "table-header-group",
+		"tbody"    : "table-row-group",
+		"tr"       : "table-row",
+		"th"       : "table-cell",
+		"td"       : "table-cell",
+		"ul"       : "block",
+		"li"       : "list-item"
 	};
 
-	jQuery.each( test, function( selector, expected ) {
-		var elem = jQuery( selector, "#show-tests" ).show();
-		assert.equal( elem.css( "display" ), expected, "Show using correct display type for " + selector );
-	} );
+	jQuery.each(test, function(selector, expected) {
+		var elem = jQuery(selector, "#show-tests").show();
+		equal( elem.css("display"), expected, "Show using correct display type for " + selector );
+	});
 
-	jQuery( "#show-tests" ).remove();
+	jQuery("#show-tests").remove();
 
 	// Make sure that showing or hiding a text node doesn't cause an error
-	jQuery( "<div>test</div> text <span>test</span>" ).show().remove();
-	jQuery( "<div>test</div> text <span>test</span>" ).hide().remove();
-} );
-
-QUnit.test( "show(Number) - other displays", function( assert ) {
-	assert.expect( 30 );
+	jQuery("<div>test</div> text <span>test</span>").show().remove();
+	jQuery("<div>test</div> text <span>test</span>").hide().remove();
+});
 
-	jQuery(
-		"<div id='show-tests'>" +
-		"<div><p><a href='#'></a></p><code></code><pre></pre><span></span></div>" +
-		"<table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table>" +
-		"<ul><li></li></ul></div>" +
-		"<table id='test-table'></table>"
-	).appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );
+test("show(Number) - other displays", function() {
+	expect(15);
 
-	var test;
 
-	jQuery( "#test-table" ).remove();
+	// #show-tests * is set display: none in CSS
+	jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>");
 
 	// Note: inline elements are expected to be inline-block
 	// because we're showing width/height
 	// Can't animate width/height inline
 	// See #14344
-	test = {
-		"div": "block",
-		"p": "block",
-		"a": "inline",
-		"code": "inline",
-		"pre": "block",
-		"span": "inline",
-		"table": "table",
-		"thead": "table-header-group",
-		"tbody": "table-row-group",
-		"tr": "table-row",
-		"th": "table-cell",
-		"td": "table-cell",
-		"ul": "block",
-		"li": "list-item"
+	var test = {
+		"div"      : "block",
+		"p"        : "block",
+		"a"        : "inline-block",
+		"code"     : "inline-block",
+		"pre"      : "block",
+		"span"     : "inline-block",
+		"table"    : "table",
+		"thead"    : "table-header-group",
+		"tbody"    : "table-row-group",
+		"tr"       : "table-row",
+		"th"       : "table-cell",
+		"td"       : "table-cell",
+		"ul"       : "block",
+		"li"       : "list-item"
 	};
 
-	jQuery.each( test, function( selector ) {
-		jQuery( selector, "#show-tests" ).show( 100 );
-	} );
-	this.clock.tick( 50 );
-	jQuery.each( test, function( selector, expected ) {
-		jQuery( selector, "#show-tests" ).each( function() {
-			assert.equal(
-				jQuery( this ).css( "display" ),
-				expected === "inline" ? "inline-block" : expected,
-				"Correct display type during animation for " + selector
-			);
-		} );
-	} );
-	this.clock.tick( 50 );
-	jQuery.each( test, function( selector, expected ) {
-		jQuery( selector, "#show-tests" ).each( function() {
-			assert.equal( jQuery( this ).css( "display" ), expected,
-				"Correct display type after animation for " + selector );
-		} );
-	} );
+	jQuery.each(test, function(selector, expected) {
+		var elem = jQuery(selector, "#show-tests").show(1, function() {
+			equal( elem.css("display"), expected, "Show using correct display type for " + selector );
+		});
+	});
+	this.clock.tick( 10 );
 
-	jQuery( "#show-tests" ).remove();
-} );
+	jQuery("#show-tests").remove();
+});
 
 // Supports #7397
-QUnit.test( "Persist correct display value", function( assert ) {
-	assert.expect( 3 );
+test("Persist correct display value", function() {
+	expect(3);
 
-	jQuery( "<div id='show-tests'><span style='position:absolute;'>foo</span></div>" )
-		.appendTo( "#qunit-fixture" ).find( "*" ).css( "display", "none" );
+	// #show-tests * is set display: none in CSS
+	jQuery("#qunit-fixture").append("<div id='show-tests'><span style='position:absolute;'>foo</span></div>");
 
-	var $span = jQuery( "#show-tests span" ),
-		displayNone = $span.css( "display" ),
+	var $span = jQuery("#show-tests span"),
+		displayNone = $span.css("display"),
 		display = "",
 		clock = this.clock;
 
 	$span.show();
 
-	display = $span.css( "display" );
+	display = $span.css("display");
 
 	$span.hide();
 
-	$span.fadeIn( 100, function() {
-		assert.equal( $span.css( "display" ), display, "Expecting display: " + display );
-		$span.fadeOut( 100, function() {
-			assert.equal( $span.css( "display" ), displayNone, "Expecting display: " + displayNone );
-			$span.fadeIn( 100, function() {
-				assert.equal( $span.css( "display" ), display, "Expecting display: " + display );
-			} );
-		} );
-	} );
+	$span.fadeIn(100, function() {
+		equal($span.css("display"), display, "Expecting display: " + display);
+		$span.fadeOut(100, function () {
+			equal($span.css("display"), displayNone, "Expecting display: " + displayNone);
+			$span.fadeIn(100, function() {
+				equal($span.css("display"), display, "Expecting display: " + display);
+			});
+		});
+	});
 
 	clock.tick( 300 );
 
-	assert.expectJqData( this, $span, "display" );
-} );
+	QUnit.expectJqData( this, $span, "olddisplay" );
+});
 
-QUnit.test( "animate(Hash, Object, Function)", function( assert ) {
-	assert.expect( 1 );
-	var hash = { opacity: "show" },
-		hashCopy = jQuery.extend( {}, hash );
-	jQuery( "#foo" ).animate( hash, 0, function() {
-		assert.equal( hash.opacity, hashCopy.opacity, "Check if animate changed the hash parameter" );
-	} );
-} );
+test("animate(Hash, Object, Function)", function() {
+	expect(1);
+	var hash = {opacity: "show"},
+		hashCopy = jQuery.extend({}, hash);
+	jQuery("#foo").animate(hash, 0, function() {
+		equal( hash.opacity, hashCopy.opacity, "Check if animate changed the hash parameter" );
+	});
+});
 
-QUnit.test( "animate relative values", function( assert ) {
+test("animate relative values", function() {
 
 	var value = 40,
 		clock = this.clock,
 		bases = [ "%", "px", "em" ],
 		adjustments = [ "px", "em" ],
-		container = jQuery( "<div></div>" )
-			.css( { position: "absolute", height: "50em", width: "50em" } ),
+		container = jQuery("<div></div>")
+			.css({ position: "absolute", height: "50em", width: "50em" }),
 		animations = bases.length * adjustments.length;
 
-	assert.expect( 2 * animations );
+	expect( 2 * animations );
 
 	jQuery.each( bases, function( _, baseUnit ) {
 		jQuery.each( adjustments, function( _, adjustUnit ) {
 			var base = value + baseUnit,
 				adjust = { height: "+=2" + adjustUnit, width: "-=2" + adjustUnit },
-				elem = jQuery( "<div></div>" )
-					.appendTo( container.clone().appendTo( "#qunit-fixture" ) )
-					.css( {
+				elem = jQuery("<div></div>")
+					.appendTo( container.clone().appendTo("#qunit-fixture") )
+					.css({
 						position: "absolute",
 						height: base,
 						width: value + adjustUnit
-					} ),
+					}),
 				baseScale = elem[ 0 ].offsetHeight / value,
 				adjustScale = elem[ 0 ].offsetWidth / value;
 
 			elem.css( "width", base ).animate( adjust, 100, function() {
-				assert.equal( this.offsetHeight, value * baseScale + 2 * adjustScale,
+				equal( this.offsetHeight, value * baseScale + 2 * adjustScale,
 					baseUnit + "+=" + adjustUnit );
-				assert.equal( this.offsetWidth, value * baseScale - 2 * adjustScale,
+				equal( this.offsetWidth, value * baseScale - 2 * adjustScale,
 					baseUnit + "-=" + adjustUnit );
 
-			} );
+			});
 
 			clock.tick( 100 );
-		} );
-	} );
-} );
+		});
+	});
+});
 
-QUnit.test( "animate negative height", function( assert ) {
-	assert.expect( 1 );
-	jQuery( "#foo" ).animate( { height: -100 }, 100, function() {
-		assert.equal( this.offsetHeight, 0, "Verify height." );
-	} );
+test("animate negative height", function() {
+	expect(1);
+	jQuery("#foo").animate({ height: -100 }, 100, function() {
+		equal( this.offsetHeight, 0, "Verify height." );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate negative margin", function( assert ) {
-	assert.expect( 1 );
-	jQuery( "#foo" ).animate( { "marginTop": -100 }, 100, function() {
-		assert.equal( jQuery( this ).css( "marginTop" ), "-100px", "Verify margin." );
-	} );
+test("animate negative margin", function() {
+	expect(1);
+	jQuery("#foo").animate({ "marginTop": -100 }, 100, function() {
+		equal( jQuery(this).css("marginTop"), "-100px", "Verify margin." );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate negative margin with px", function( assert ) {
-	assert.expect( 1 );
-	jQuery( "#foo" ).animate( { marginTop: "-100px" }, 100, function() {
-		assert.equal( jQuery( this ).css( "marginTop" ), "-100px", "Verify margin." );
-	} );
+test("animate negative margin with px", function() {
+	expect(1);
+	jQuery("#foo").animate({ marginTop: "-100px" }, 100, function() {
+		equal( jQuery(this).css("marginTop"), "-100px", "Verify margin." );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate negative padding", function( assert ) {
-	assert.expect( 1 );
-	jQuery( "#foo" ).animate( { "paddingBottom": -100 }, 100, function() {
-		assert.equal( jQuery( this ).css( "paddingBottom" ), "0px", "Verify paddingBottom." );
-	} );
+test("animate negative padding", function() {
+	expect(1);
+	jQuery("#foo").animate({ "paddingBottom": -100 }, 100, function() {
+		equal( jQuery(this).css("paddingBottom"), "0px", "Verify paddingBottom." );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate block as inline width/height", function( assert ) {
-	assert.expect( 3 );
+test("animate block as inline width/height", function() {
+	expect(3);
 
-	var span = jQuery( "<span>" ).css( "display", "inline-block" ).appendTo( "body" );
+	var span = jQuery("<span>").css("display", "inline-block").appendTo("body");
 
 	span.remove();
 
-	jQuery( "#foo" ).css( { display: "inline", width: "", height: "" } ).animate( { width: 42, height: 42 }, 100, function() {
-		assert.equal( jQuery( this ).css( "display" ), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
-		assert.equal( this.offsetWidth, 42, "width was animated" );
-		assert.equal( this.offsetHeight, 42, "height was animated" );
-	} );
+	jQuery("#foo").css({ display: "inline", width: "", height: "" }).animate({ width: 42, height: 42 }, 100, function() {
+		equal( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+		equal( this.offsetWidth, 42, "width was animated" );
+		equal( this.offsetHeight, 42, "height was animated" );
+	});
 
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate native inline width/height", function( assert ) {
-	assert.expect( 3 );
+test("animate native inline width/height", function() {
+	expect(3);
 
-	var span = jQuery( "<span>" ).css( "display", "inline-block" ).appendTo( "body" );
+	var span = jQuery("<span>").css("display", "inline-block").appendTo("body");
 
 	span.remove();
 
-	jQuery( "#foo" ).css( { display: "", width: "", height: "" } )
-		.append( "<span>text</span>" )
-		.children( "span" )
-			.animate( { width: 42, height: 42 }, 100, function() {
-				assert.equal( jQuery( this ).css( "display" ), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
-				assert.equal( this.offsetWidth, 42, "width was animated" );
-				assert.equal( this.offsetHeight, 42, "height was animated" );
-			} );
+	jQuery("#foo").css({ display: "", width: "", height: "" })
+		.append("<span>text</span>")
+		.children("span")
+			.animate({ width: 42, height: 42 }, 100, function() {
+				equal( jQuery(this).css("display"), "inline-block", "inline-block was set on non-floated inline element when animating width/height" );
+				equal( this.offsetWidth, 42, "width was animated" );
+				equal( this.offsetHeight, 42, "height was animated" );
+			});
 
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate block width/height", function( assert ) {
-	assert.expect( 3 );
+test( "animate block width/height", function() {
+	expect( 3 );
 
-	jQuery( "<div>" ).appendTo( "#qunit-fixture" ).css( {
+	jQuery("<div>").appendTo("#qunit-fixture").css({
 		display: "block",
 		width: 20,
 		height: 20,
 		paddingLeft: 60
-	} ).animate( {
+	}).animate({
 		width: 42,
 		height: 42
 	}, {
 		duration: 100,
 		step: function() {
 			if ( jQuery( this ).width() > 42 ) {
-				assert.ok( false, "width was incorrectly augmented during animation" );
+				ok( false, "width was incorrectly augmented during animation" );
 			}
 		},
 		complete: function() {
-			assert.equal( jQuery( this ).css( "display" ), "block", "inline-block was not set on block element when animating width/height" );
-			assert.equal( jQuery( this ).width(), 42, "width was animated" );
-			assert.equal( jQuery( this ).height(), 42, "height was animated" );
+			equal( jQuery( this ).css("display"), "block", "inline-block was not set on block element when animating width/height" );
+			equal( jQuery( this ).width(), 42, "width was animated" );
+			equal( jQuery( this ).height(), 42, "height was animated" );
 		}
-	} );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate table width/height", function( assert ) {
-	assert.expect( 1 );
+test( "animate table width/height", function() {
+	expect(1);
 
-	jQuery( "#table" ).animate( { width: 42, height: 42 }, 100, function() {
-		assert.equal( jQuery( this ).css( "display" ), "table", "display mode is correct" );
-	} );
+	jQuery( "#table" ).animate({ width: 42, height: 42 }, 100, function() {
+		equal( jQuery( this ).css( "display" ), "table", "display mode is correct" );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate table-row width/height", function( assert ) {
-	assert.expect( 3 );
-	var tr = jQuery( "#table" )
-			.attr( { "cellspacing": 0, "cellpadding": 0, "border": 0 } )
-			.html( "<tr style='height:42px;'><td style='padding:0;'><div style='width:20px;height:20px;'></div></td></tr>" )
-			.find( "tr" );
-
-	tr.animate( { width: 10, height: 10 }, 100, function() {
-		assert.equal( jQuery( this ).css( "display" ), "table-row", "display mode is correct" );
-		assert.equal( this.offsetWidth, 20, "width animated to shrink wrap point" );
-		assert.equal( this.offsetHeight, 20, "height animated to shrink wrap point" );
-	} );
+test("animate table-row width/height", function() {
+	expect(3);
+	var tr = jQuery("#table")
+			.attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
+			.html("<tr style='height:42px;'><td style='padding:0;'><div style='width:20px;height:20px;'></div></td></tr>")
+			.find("tr");
+
+	tr.animate({ width: 10, height: 10 }, 100, function() {
+		equal( jQuery( this ).css( "display" ), "table-row", "display mode is correct" );
+		equal( this.offsetWidth, 20, "width animated to shrink wrap point" );
+		equal( this.offsetHeight, 20, "height animated to shrink wrap point" );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate table-cell width/height", function( assert ) {
-	assert.expect( 3 );
+test("animate table-cell width/height", function() {
+	expect(3);
 
 	var td = jQuery( "#table" )
-			.attr( { "cellspacing": 0, "cellpadding": 0, "border": 0 } )
+			.attr({ "cellspacing": 0, "cellpadding": 0, "border": 0 })
 			.html( "<tr><td style='width:42px;height:42px;padding:0;'><div style='width:20px;height:20px;'></div></td></tr>" )
 			.find( "td" );
 
-	td.animate( { width: 10, height: 10 }, 100, function() {
-		assert.equal( jQuery( this ).css( "display" ), "table-cell", "display mode is correct" );
-		assert.equal( this.offsetWidth, 20, "width animated to shrink wrap point" );
-		assert.equal( this.offsetHeight, 20, "height animated to shrink wrap point" );
-	} );
+	td.animate({ width: 10, height: 10 }, 100, function() {
+		equal( jQuery( this ).css( "display" ), "table-cell", "display mode is correct" );
+		equal( this.offsetWidth, 20, "width animated to shrink wrap point" );
+		equal( this.offsetHeight, 20, "height animated to shrink wrap point" );
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "animate percentage(%) on width/height", function( assert ) {
-	assert.expect( 2 );
+test("animate percentage(%) on width/height", function() {
+	expect( 2 );
 
-	var $div = jQuery( "<div style='position:absolute;top:-999px;left:-999px;width:60px;height:60px;'><div style='width:50%;height:50%;'></div></div>" )
-		.appendTo( "#qunit-fixture" ).children( "div" );
+	var $div = jQuery("<div style='position:absolute;top:-999px;left:-999px;width:60px;height:60px;'><div style='width:50%;height:50%;'></div></div>")
+		.appendTo("#qunit-fixture").children("div");
 
-	$div.animate( { width: "25%", height: "25%" }, 13, function() {
-		var $this = jQuery( this );
-		assert.equal( $this.css( "width" ), "15px", "Width was animated to 15px rather than 25px" );
-		assert.equal( $this.css( "height" ), "15px", "Height was animated to 15px rather than 25px" );
-	} );
+	$div.animate({ width: "25%", height: "25%" }, 13, function() {
+		var $this = jQuery(this);
+		equal( $this.css("width"), "15px", "Width was animated to 15px rather than 25px");
+		equal( $this.css("height"), "15px", "Height was animated to 15px rather than 25px");
+	});
 	this.clock.tick( 20 );
-} );
+});
 
-QUnit.test( "animate resets overflow-x and overflow-y when finished", function( assert ) {
-	assert.expect( 2 );
-	jQuery( "#foo" )
-		.css( { display: "block", width: 20, height: 20, overflowX: "visible", overflowY: "auto" } )
-		.animate( { width: 42, height: 42 }, 100, function() {
-			assert.equal( this.style.overflowX, "visible", "overflow-x is visible" );
-			assert.equal( this.style.overflowY, "auto", "overflow-y is auto" );
-		} );
+test("animate resets overflow-x and overflow-y when finished", function() {
+	expect(2);
+	jQuery("#foo")
+		.css({ display: "block", width: 20, height: 20, overflowX: "visible", overflowY: "auto" })
+		.animate({ width: 42, height: 42 }, 100, function() {
+			equal( this.style.overflowX, "visible", "overflow-x is visible" );
+			equal( this.style.overflowY, "auto", "overflow-y is auto" );
+		});
 	this.clock.tick( 100 );
-} );
+});
 
 /* // This test ends up being flaky depending upon the CPU load
-QUnit.test("animate option (queue === false)", function( assert ) {
-	assert.expect(1);
-	QUnit.stop();
+test("animate option (queue === false)", function () {
+	expect(1);
+	stop();
 
 	var order = [];
 
@@ -443,8 +417,8 @@ QUnit.test("animate option (queue === false)", function( assert ) {
 	$foo.animate({width:"100px"}, 3000, function () {
 		// should finish after unqueued animation so second
 		order.push(2);
-		assert.deepEqual( order, [ 1, 2 ], "Animations finished in the correct order" );
-		QUnit.start();
+		deepEqual( order, [ 1, 2 ], "Animations finished in the correct order" );
+		start();
 	});
 	$foo.animate({fontSize:"2em"}, {queue:false, duration:10, complete:function () {
 		// short duration and out of queue so should finish first
@@ -453,48 +427,48 @@ QUnit.test("animate option (queue === false)", function( assert ) {
 });
 */
 
-QUnit.test( "animate option { queue: false }", function( assert ) {
-	assert.expect( 2 );
+test( "animate option { queue: false }", function() {
+	expect( 2 );
 	var foo = jQuery( "#foo" );
 
-	foo.animate( {
+	foo.animate({
 		fontSize: "2em"
 	}, {
 		queue: false,
 		duration: 10,
 		complete: function() {
-			assert.ok( true, "Animation Completed" );
+			ok( true, "Animation Completed" );
 		}
-	} );
+	});
 	this.clock.tick( 10 );
 
-	assert.equal( foo.queue().length, 0, "Queue is empty" );
-} );
+	equal( foo.queue().length, 0, "Queue is empty" );
+});
 
-QUnit.test( "animate option { queue: true }", function( assert ) {
-	assert.expect( 2 );
+test( "animate option { queue: true }", function() {
+	expect( 2 );
 	var foo = jQuery( "#foo" );
 
-	foo.animate( {
+	foo.animate({
 		fontSize: "2em"
 	}, {
 		queue: true,
 		duration: 10,
 		complete: function() {
-			assert.ok( true, "Animation Completed" );
+			ok( true, "Animation Completed" );
 		}
-	} );
+	});
 
-	assert.notEqual( foo.queue().length, 0, "Default queue is not empty" );
+	notEqual( foo.queue().length, 0, "Default queue is not empty" );
 
 	//clear out existing timers before next test
 	this.clock.tick( 10 );
-} );
+});
 
-QUnit.test( "animate option { queue: 'name' }", function( assert ) {
-	assert.expect( 5 );
+test( "animate option { queue: 'name' }", function() {
+	expect( 5 );
 	var foo = jQuery( "#foo" ),
-		origWidth = parseFloat( foo.css( "width" ) ),
+		origWidth = parseFloat( foo.css("width") ),
 		order = [];
 
 	foo.animate( { width: origWidth + 100 }, {
@@ -504,127 +478,128 @@ QUnit.test( "animate option { queue: 'name' }", function( assert ) {
 
 			// second callback function
 			order.push( 2 );
-			assert.equal( parseFloat( foo.css( "width" ) ), origWidth + 100, "Animation ended" );
-			assert.equal( foo.queue( "name" ).length, 1, "Queue length of 'name' queue" );
+			equal( parseFloat( foo.css("width") ), origWidth + 100, "Animation ended" );
+			equal( foo.queue("name").length, 1, "Queue length of 'name' queue" );
 		}
-	} ).queue( "name", function() {
+	}).queue( "name", function() {
 
 		// last callback function
-		assert.deepEqual( order, [ 1, 2 ], "Callbacks in expected order" );
-	} );
+		deepEqual( order, [ 1, 2 ], "Callbacks in expected order" );
+	});
+
 
 	// this is the first callback function that should be called
 	order.push( 1 );
-	assert.equal( parseFloat( foo.css( "width" ) ), origWidth, "Animation does not start on its own." );
-	assert.equal( foo.queue( "name" ).length, 2, "Queue length of 'name' queue" );
+	equal( parseFloat( foo.css("width") ), origWidth, "Animation does not start on its own." );
+	equal( foo.queue("name").length, 2, "Queue length of 'name' queue" );
 
 	foo.dequeue( "name" );
 	this.clock.tick( 10 );
 
-} );
+});
 
-QUnit.test( "animate with no properties", function( assert ) {
-	assert.expect( 2 );
+test("animate with no properties", function() {
+	expect(2);
 
 	var foo,
-		divs = jQuery( "div" ),
+		divs = jQuery("div"),
 		count = 0;
 
-	divs.animate( {}, function() {
+	divs.animate({}, function(){
 		count++;
-	} );
+	});
 
-	assert.equal( divs.length, count, "Make sure that callback is called for each element in the set." );
+	equal( divs.length, count, "Make sure that callback is called for each element in the set." );
 
-	foo = jQuery( "#foo" );
 
-	foo.animate( {} );
-	foo.animate( { top: 10 }, 100, function() {
-		assert.ok( true, "Animation was properly dequeued." );
-	} );
+	foo = jQuery("#foo");
+
+	foo.animate({});
+	foo.animate({top: 10}, 100, function(){
+		ok( true, "Animation was properly dequeued." );
+	});
 	this.clock.tick( 100 );
-} );
+});
+
+test("animate duration 0", function() {
+	expect(11);
 
-QUnit.test( "animate duration 0", function( assert ) {
-	assert.expect( 11 );
 
 	var $elem,
-		$elems = jQuery( [ { a:0 },{ a:0 } ] ),
+		$elems = jQuery([{ a:0 },{ a:0 }]),
 		counter = 0;
 
-	assert.equal( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
+	equal( jQuery.timers.length, 0, "Make sure no animation was running from another test" );
 
-	$elems.eq( 0 ).animate( { a:1 }, 0, function() {
-		assert.ok( true, "Animate a simple property." );
+	$elems.eq(0).animate( {a:1}, 0, function(){
+		ok( true, "Animate a simple property." );
 		counter++;
-	} );
+	});
 
 	// Failed until [6115]
-	assert.equal( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
+	equal( jQuery.timers.length, 0, "Make sure synchronic animations are not left on jQuery.timers" );
 
-	assert.equal( counter, 1, "One synchronic animations" );
+	equal( counter, 1, "One synchronic animations" );
 
-	$elems.animate( { a:2 }, 0, function() {
-		assert.ok( true, "Animate a second simple property." );
+	$elems.animate( { a:2 }, 0, function(){
+		ok( true, "Animate a second simple property." );
 		counter++;
-	} );
+	});
 
-	assert.equal( counter, 3, "Multiple synchronic animations" );
+	equal( counter, 3, "Multiple synchronic animations" );
 
-	$elems.eq( 0 ).animate( { a:3 }, 0, function() {
-		assert.ok( true, "Animate a third simple property." );
+	$elems.eq(0).animate( {a:3}, 0, function(){
+		ok( true, "Animate a third simple property." );
 		counter++;
-	} );
-	$elems.eq( 1 ).animate( { a:3 }, 200, function() {
+	});
+	$elems.eq(1).animate( {a:3}, 200, function(){
 		counter++;
-
 		// Failed until [6115]
-		assert.equal( counter, 5, "One synchronic and one asynchronic" );
-	} );
+		equal( counter, 5, "One synchronic and one asynchronic" );
+	});
 	this.clock.tick( 200 );
 
-	$elem = jQuery( "<div />" );
-	$elem.show( 0, function() {
-		assert.ok( true, "Show callback with no duration" );
-	} );
-	$elem.hide( 0, function() {
-		assert.ok( true, "Hide callback with no duration" );
-	} );
+	$elem = jQuery("<div />");
+	$elem.show(0, function(){
+		ok(true, "Show callback with no duration");
+	});
+	$elem.hide(0, function(){
+		ok(true, "Hide callback with no duration");
+	});
 
 	// manually clean up detached elements
 	$elem.remove();
-} );
-
-QUnit.test( "animate hyphenated properties", function( assert ) {
-	assert.expect( 1 );
+});
 
-	jQuery( "#foo" )
-		.css( "font-size", 10 )
-		.animate( { "font-size": 20 }, 200, function() {
-			assert.equal( this.style.fontSize, "20px", "The font-size property was animated." );
-		} );
+test("animate hyphenated properties", function() {
+	expect(1);
 
+	jQuery("#foo")
+		.css("font-size", 10)
+		.animate({"font-size": 20}, 200, function() {
+			equal( this.style.fontSize, "20px", "The font-size property was animated." );
+		});
 	// FIXME why is this double only when run with other tests
 	this.clock.tick( 400 );
 
-} );
+});
 
-QUnit.test( "animate non-element", function( assert ) {
-	assert.expect( 1 );
+test("animate non-element", function() {
+	expect(1);
 
 	var obj = { test: 0 };
 
-	jQuery( obj ).animate( { test: 200 }, 200, function() {
-		assert.equal( obj.test, 200, "The custom property should be modified." );
-	} );
+	jQuery(obj).animate({test: 200}, 200, function(){
+		equal( obj.test, 200, "The custom property should be modified." );
+	});
 	this.clock.tick( 200 );
-} );
+});
 
-QUnit.test( "stop()", function( assert ) {
-	assert.expect( 4 );
+test("stop()", function() {
+	expect( 4 );
 
 	var $one, $two,
-		$foo = jQuery( "#foo" ),
+		$foo = jQuery("#foo"),
 		w = 0,
 		nw;
 
@@ -632,185 +607,180 @@ QUnit.test( "stop()", function( assert ) {
 		.animate( { "width": "show" }, 1500 );
 
 	this.clock.tick( 100 );
-	nw = $foo.css( "width" );
-	assert.notEqual( parseFloat( nw ), w, "An animation occurred " + nw + " " + w + "px" );
+	nw = $foo.css("width");
+	notEqual( parseFloat( nw ), w, "An animation occurred " + nw + " " + w + "px" );
 	$foo.stop();
 
-	nw = $foo.css( "width" );
-	assert.notEqual( parseFloat( nw ), w, "Stop didn't reset the animation " + nw + " " + w + "px" );
+	nw = $foo.css("width");
+	notEqual( parseFloat( nw ), w, "Stop didn't reset the animation " + nw + " " + w + "px" );
 
 	this.clock.tick( 100 );
 
 	$foo.removeData();
-	$foo.removeData( undefined, true );
-	assert.equal( nw, $foo.css( "width" ), "The animation didn't continue" );
+	$foo.removeData(undefined, true);
+	equal( nw, $foo.css("width"), "The animation didn't continue" );
 
-	$one = jQuery( "#fadein" );
-	$two = jQuery( "#show" );
-	$one.fadeTo( 100, 0, function() {
+	$one = jQuery("#fadein");
+	$two = jQuery("#show");
+	$one.fadeTo(100, 0, function() {
 		$one.stop();
-	} );
+	});
 	this.clock.tick( 100 );
-	$two.fadeTo( 100, 0, function() {
-		assert.equal( $two.css( "opacity" ), "0", "Stop does not interfere with animations on other elements (#6641)" );
-
+	$two.fadeTo(100, 0, function() {
+		equal( $two.css("opacity"), "0", "Stop does not interfere with animations on other elements (#6641)" );
 		// Reset styles
-		$one.add( $two ).css( "opacity", "" );
-	} );
+		$one.add( $two ).css("opacity", "");
+	});
 	this.clock.tick( 100 );
-} );
+});
 
-QUnit.test( "stop() - several in queue", function( assert ) {
-	assert.expect( 5 );
+test("stop() - several in queue", function() {
+	expect( 5 );
 
 	var nw, $foo = jQuery( "#foo" );
 
 	// default duration is 400ms, so 800px ensures we aren't 0 or 1 after 1ms
 	$foo.hide().css( "width", 800 );
 
-	$foo.animate( { "width": "show" }, 400, "linear" );
-	$foo.animate( { "width": "hide" } );
-	$foo.animate( { "width": "show" } );
+	$foo.animate({ "width": "show" }, 400, "linear");
+	$foo.animate({ "width": "hide" });
+	$foo.animate({ "width": "show" });
 
 	this.clock.tick( 1 );
 
 	jQuery.fx.tick();
-	assert.equal( $foo.queue().length, 3, "3 in the queue" );
+	equal( $foo.queue().length, 3, "3 in the queue" );
 
 	nw = $foo.css( "width" );
-	assert.notEqual( parseFloat( nw ), 1, "An animation occurred " + nw );
+	notEqual( parseFloat( nw ), 1, "An animation occurred " + nw );
 	$foo.stop();
 
-	assert.equal( $foo.queue().length, 2, "2 in the queue" );
+	equal( $foo.queue().length, 2, "2 in the queue" );
 	nw = $foo.css( "width" );
-	assert.notEqual( parseFloat( nw ), 1, "Stop didn't reset the animation " + nw );
+	notEqual( parseFloat( nw ), 1, "Stop didn't reset the animation " + nw );
 
 	$foo.stop( true );
 
-	assert.equal( $foo.queue().length, 0, "0 in the queue" );
-} );
+	equal( $foo.queue().length, 0, "0 in the queue" );
+});
 
-QUnit.test( "stop(clearQueue)", function( assert ) {
-	assert.expect( 4 );
+test("stop(clearQueue)", function() {
+	expect(4);
 
-	var $foo = jQuery( "#foo" ),
+	var $foo = jQuery("#foo"),
 		w = 0,
 		nw;
-	$foo.hide().css( "width", 200 ).css( "width" );
+	$foo.hide().css( "width", 200 ).css("width");
 
-	$foo.animate( { "width": "show" }, 1000 );
-	$foo.animate( { "width": "hide" }, 1000 );
-	$foo.animate( { "width": "show" }, 1000 );
+	$foo.animate({ "width": "show" }, 1000);
+	$foo.animate({ "width": "hide" }, 1000);
+	$foo.animate({ "width": "show" }, 1000);
 	this.clock.tick( 100 );
-	nw = $foo.css( "width" );
-	assert.ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px" );
-	$foo.stop( true );
+	nw = $foo.css("width");
+	ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px");
+	$foo.stop(true);
 
-	nw = $foo.css( "width" );
-	assert.ok( parseFloat( nw ) !== w, "Stop didn't reset the animation " + nw + " " + w + "px" );
+	nw = $foo.css("width");
+	ok( parseFloat( nw ) !== w, "Stop didn't reset the animation " + nw + " " + w + "px");
 
-	assert.equal( $foo.queue().length, 0, "The animation queue was cleared" );
+	equal( $foo.queue().length, 0, "The animation queue was cleared" );
 	this.clock.tick( 100 );
-	assert.equal( nw, $foo.css( "width" ), "The animation didn't continue" );
-} );
+	equal( nw, $foo.css("width"), "The animation didn't continue" );
+});
 
-QUnit.test( "stop(clearQueue, gotoEnd)", function( assert ) {
-	assert.expect( 1 );
+test("stop(clearQueue, gotoEnd)", function() {
+	expect(1);
 
-	var $foo = jQuery( "#foo" ),
+	var $foo = jQuery("#foo"),
 		w = 0,
 		nw;
-	$foo.hide().css( "width", 200 ).css( "width" );
+	$foo.hide().css( "width", 200 ).css("width");
 
-	$foo.animate( { width: "show" }, 1000 );
-	$foo.animate( { width: "hide" }, 1000 );
-	$foo.animate( { width: "show" }, 1000 );
-	$foo.animate( { width: "hide" }, 1000 );
+	$foo.animate({ width: "show" }, 1000);
+	$foo.animate({ width: "hide" }, 1000);
+	$foo.animate({ width: "show" }, 1000);
+	$foo.animate({ width: "hide" }, 1000);
 	this.clock.tick( 100 );
-	nw = $foo.css( "width" );
-	assert.ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px" );
-	$foo.stop( false, true );
-
-	nw = $foo.css( "width" );
+	nw = $foo.css("width");
+	ok( parseFloat( nw ) !== w, "An animation occurred " + nw + " " + w + "px");
+	$foo.stop(false, true);
 
+	nw = $foo.css("width");
 	// Disabled, being flaky
 	//equal( nw, 1, "Stop() reset the animation" );
 
 	this.clock.tick( 100 );
-
 	// Disabled, being flaky
 	//equal( $foo.queue().length, 2, "The next animation continued" );
-	$foo.stop( true );
-} );
+	$foo.stop(true);
+});
 
-QUnit.test( "stop( queue, ..., ... ) - Stop single queues", function( assert ) {
-	assert.expect( 3 );
+test( "stop( queue, ..., ... ) - Stop single queues", function() {
+	expect( 3 );
 	var saved,
-		foo = jQuery( "#foo" ).css( { width: 200, height: 200 } );
+		foo = jQuery("#foo").css({ width: 200, height: 200 });
 
-	foo.animate( {
+	foo.animate({
 		width: 400
-	}, {
+	},{
 		duration: 500,
 		complete: function() {
-			assert.equal( parseFloat( foo.css( "width" ) ), 400, "Animation completed for standard queue" );
-			assert.equal( parseFloat( foo.css( "height" ) ), saved, "Height was not changed after the second stop" );
+			equal( parseFloat( foo.css("width") ), 400, "Animation completed for standard queue" );
+			equal( parseFloat( foo.css("height") ), saved, "Height was not changed after the second stop");
 		}
-	} );
+	});
 
-	foo.animate( {
+	foo.animate({
 		height: 400
-	}, {
+	},{
 		duration: 1000,
 		queue: "height"
-	} ).dequeue( "height" ).stop( "height", false, true );
+	}).dequeue("height").stop( "height", false, true );
 
-	assert.equal( parseFloat( foo.css( "height" ) ), 400, "Height was stopped with gotoEnd" );
+	equal( parseFloat( foo.css("height") ), 400, "Height was stopped with gotoEnd" );
 
-	foo.animate( {
+	foo.animate({
 		height: 200
-	}, {
+	},{
 		duration: 1000,
 		queue: "height"
-	} ).dequeue( "height" ).stop( "height", false, false );
-	saved = parseFloat( foo.css( "height" ) );
+	}).dequeue( "height" ).stop( "height", false, false );
+	saved = parseFloat( foo.css("height") );
         this.clock.tick( 500 );
-} );
+});
 
-QUnit.test( "toggle()", function( assert ) {
-	assert.expect( 6 );
-	var x = jQuery( "#foo" );
-	assert.ok( x.is( ":visible" ), "is visible" );
+test("toggle()", function() {
+	expect(6);
+	var x = jQuery("#foo");
+	ok( x.is(":visible"), "is visible" );
 	x.toggle();
-	assert.ok( x.is( ":hidden" ), "is hidden" );
+	ok( x.is(":hidden"), "is hidden" );
 	x.toggle();
-	assert.ok( x.is( ":visible" ), "is visible again" );
-
-	x.toggle( true );
-	assert.ok( x.is( ":visible" ), "is visible" );
-	x.toggle( false );
-	assert.ok( x.is( ":hidden" ), "is hidden" );
-	x.toggle( true );
-	assert.ok( x.is( ":visible" ), "is visible again" );
-} );
-
-QUnit.test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function( assert ) {
-	assert.expect( 7 );
+	ok( x.is(":visible"), "is visible again" );
+
+	x.toggle(true);
+	ok( x.is(":visible"), "is visible" );
+	x.toggle(false);
+	ok( x.is(":hidden"), "is hidden" );
+	x.toggle(true);
+	ok( x.is(":visible"), "is visible again" );
+});
 
-	var div = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" ).css( {
+test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", 7, function() {
+	var div = jQuery( "<div></div>" ).appendTo( "#qunit-fixture" ).css({
 			color: "#ABC",
 			border: "5px solid black",
 			left: "auto",
 			marginBottom: "-11000px"
-		} )[ 0 ];
+		})[0];
 
-	assert.equal(
+	equal(
 		( new jQuery.fx( div, {}, "color" ) ).cur(),
 		jQuery.css( div, "color" ),
 		"Return the same value as jQuery.css for complex properties (bug #7912)"
 	);
 
-	assert.strictEqual(
+	strictEqual(
 		( new jQuery.fx( div, {}, "borderLeftWidth" ) ).cur(),
 		5,
 		"Return simple values parsed as Float"
@@ -822,12 +792,12 @@ QUnit.test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function( assert ) {
 	// value as it is being newed
 	jQuery.cssHooks.backgroundPosition = {
 		get: function() {
-			assert.ok( true, "hook used" );
+			ok( true, "hook used" );
 			return "";
 		}
 	};
 
-	assert.strictEqual(
+	strictEqual(
 		( new jQuery.fx( div, {}, "backgroundPosition" ) ).cur(),
 		0,
 		"Return 0 when jQuery.css returns an empty string"
@@ -835,44 +805,44 @@ QUnit.test( "jQuery.fx.prototype.cur() - <1.8 Back Compat", function( assert ) {
 
 	delete jQuery.cssHooks.backgroundPosition;
 
-	assert.strictEqual(
+	strictEqual(
 		( new jQuery.fx( div, {}, "left" ) ).cur(),
 		0,
 		"Return 0 when jQuery.css returns 'auto'"
 	);
 
-	assert.equal(
+	equal(
 		( new jQuery.fx( div, {}, "marginBottom" ) ).cur(),
 		-11000,
 		"support negative values < -10000 (bug #7193)"
 	);
 
 	jQuery( div ).remove();
-} );
+});
 
-QUnit.test( "Overflow and Display", function( assert ) {
-	assert.expect( 4 );
+test("Overflow and Display", function() {
+	expect(4);
 
 	var
-		testClass = jQuery.makeTest( "Overflow and Display" )
-			.addClass( "overflow inline" ),
-		testStyle = jQuery.makeTest( "Overflow and Display (inline style)" )
-			.css( { overflow: "visible", display: "inline" } ),
+		testClass = jQuery.makeTest("Overflow and Display")
+			.addClass("overflow inline"),
+		testStyle = jQuery.makeTest("Overflow and Display (inline style)")
+			.css({ overflow: "visible", display: "inline" }),
 		done = function() {
-			assert.equal( jQuery.css( this, "overflow" ), "visible", "Overflow should be 'visible'" );
-			assert.equal( jQuery.css( this, "display" ), "inline", "Display should be 'inline'" );
+			equal( jQuery.css( this, "overflow" ), "visible", "Overflow should be 'visible'" );
+			equal( jQuery.css( this, "display" ), "inline", "Display should be 'inline'" );
 		};
 
 	testClass.add( testStyle )
-		.addClass( "widewidth" )
-		.text( "Some sample text." )
-		.before( "text before" )
-		.after( "text after" )
-		.animate( { opacity: 0.5 }, "slow", done );
+		.addClass("widewidth")
+		.text("Some sample text.")
+		.before("text before")
+		.after("text after")
+		.animate({ opacity: 0.5 }, "slow", done );
 	this.clock.tick( 600 );
-} );
+});
 
-jQuery.each( {
+jQuery.each({
 	"CSS Auto": function( elem, prop ) {
 		jQuery( elem ).addClass( "auto" + prop )
 			.text( "This is a long string of text." );
@@ -908,9 +878,9 @@ jQuery.each( {
 		return 0;
 	}
 }, function( fn, f ) {
-	jQuery.each( {
+	jQuery.each({
 		"show": function( elem, prop ) {
-			jQuery( elem ).hide().addClass( "wide" + prop );
+			jQuery( elem ).hide( ).addClass( "wide" + prop );
 			return "show";
 		},
 		"hide": function( elem, prop ) {
@@ -929,7 +899,7 @@ jQuery.each( {
 			return 0;
 		}
 	}, function( tn, t ) {
-		QUnit.test( fn + " to " + tn, function( assert ) {
+		test(fn + " to " + tn, function() {
 			var num, anim,
 				elem = jQuery.makeTest( fn + " to " + tn ),
 				t_w = t( elem, "width" ),
@@ -944,44 +914,43 @@ jQuery.each( {
 			}
 
 			num = 0;
-
 			// TODO: uncrowd this
-			if ( t_h === "show" ) { num++; }
-			if ( t_w === "show" ) { num++; }
-			if ( t_w === "hide" || t_w === "show" ) { num++; }
-			if ( t_h === "hide" || t_h === "show" ) { num++; }
-			if ( t_o === "hide" || t_o === "show" ) { num++; }
-			if ( t_w === "hide" ) { num++; }
-			if ( t_o.constructor === Number ) { num += 2; }
-			if ( t_w.constructor === Number ) { num += 2; }
-			if ( t_h.constructor === Number ) { num += 2; }
-
-			assert.expect( num );
+			if ( t_h === "show" ) {num++;}
+			if ( t_w === "show" ) {num++;}
+			if ( t_w === "hide" || t_w === "show" ) {num++;}
+			if ( t_h === "hide" || t_h === "show" ) {num++;}
+			if ( t_o === "hide" || t_o === "show" ) {num++;}
+			if ( t_w === "hide" ) {num++;}
+			if ( t_o.constructor === Number ) {num += 2;}
+			if ( t_w.constructor === Number ) {num += 2;}
+			if ( t_h.constructor === Number ) {num +=2;}
+
+			expect( num );
 
 			anim = { width: t_w, height: t_h, opacity: t_o };
 
-			elem.animate( anim, 50 );
+			elem.animate(anim, 50);
+
+			jQuery.when( elem ).done(function( elem ) {
+				var cur_o, cur_w, cur_h, old_h;
 
-			jQuery.when( elem ).done( function( $elem ) {
-				var cur_o, cur_w, cur_h, old_h,
-					elem = $elem[ 0 ];
+				elem = elem[ 0 ];
 
 				if ( t_w === "show" ) {
-					assert.equal( $elem.css( "display" ), "block",
-						"Showing, display should block: " + elem.style.display );
+					equal( elem.style.display, "block", "Showing, display should block: " + elem.style.display );
 				}
 
 				if ( t_w === "hide" || t_w === "show" ) {
-					assert.ok( f_w === "" ? elem.style.width === f_w : elem.style.width.indexOf( f_w ) === 0, "Width must be reset to " + f_w + ": " + elem.style.width );
+					ok( f_w === "" ? elem.style.width === f_w : elem.style.width.indexOf( f_w ) === 0, "Width must be reset to " + f_w + ": " + elem.style.width );
 				}
 
 				if ( t_h === "hide" || t_h === "show" ) {
-					assert.ok( f_h === "" ? elem.style.height === f_h : elem.style.height.indexOf( f_h ) === 0, "Height must be reset to " + f_h + ": " + elem.style.height );
+					ok( f_h === "" ? elem.style.height === f_h : elem.style.height.indexOf( f_h ) === 0, "Height must be reset to " + f_h + ": " + elem.style.height );
 				}
 
-				cur_o = jQuery.style( elem, "opacity" );
+				cur_o = jQuery.style(elem, "opacity");
 
-				if ( f_o !== jQuery.css( elem, "opacity" ) ) {
+				if ( f_o !== jQuery.css(elem, "opacity") ) {
 					f_o = f( elem, "opacity" );
 				}
 
@@ -990,75 +959,74 @@ jQuery.each( {
 				if ( f_o === "" ) {
 					f_o = 1;
 				}
-
 				// See above
 				if ( cur_o === "" ) {
 					cur_o = 1;
 				}
 
 				if ( t_o === "hide" || t_o === "show" ) {
-					assert.equal( cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o );
+					equal( cur_o, f_o, "Opacity must be reset to " + f_o + ": " + cur_o );
 				}
 
 				if ( t_w === "hide" ) {
-					assert.equal( elem.style.display, "none", "Hiding, display should be none: " + elem.style.display );
+					equal( elem.style.display, "none", "Hiding, display should be none: " + elem.style.display );
 				}
 
 				if ( t_o.constructor === Number ) {
-					assert.equal( cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o );
+					equal( cur_o, t_o, "Final opacity should be " + t_o + ": " + cur_o );
 
-					assert.ok( jQuery.css( elem, "opacity" ) !== "" || cur_o === t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o );
+					ok( jQuery.css(elem, "opacity") !== "" || cur_o === t_o, "Opacity should be explicitly set to " + t_o + ", is instead: " + cur_o );
 				}
 
 				if ( t_w.constructor === Number ) {
-					assert.equal( elem.style.width, t_w + "px", "Final width should be " + t_w + ": " + elem.style.width );
+					equal( elem.style.width, t_w + "px", "Final width should be " + t_w + ": " + elem.style.width );
 
-					cur_w = jQuery.css( elem, "width" );
+					cur_w = jQuery.css( elem,"width" );
 
-					assert.ok( elem.style.width !== "" || cur_w === t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w );
+					ok( elem.style.width !== "" || cur_w === t_w, "Width should be explicitly set to " + t_w + ", is instead: " + cur_w );
 				}
 
 				if ( t_h.constructor === Number ) {
-					assert.equal( elem.style.height, t_h + "px", "Final height should be " + t_h + ": " + elem.style.height );
+					equal( elem.style.height, t_h + "px", "Final height should be " + t_h + ": " + elem.style.height );
 
-					cur_h = jQuery.css( elem, "height" );
+					cur_h = jQuery.css( elem,"height" );
 
-					assert.ok( elem.style.height !== "" || cur_h === t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_h );
+					ok( elem.style.height !== "" || cur_h === t_h, "Height should be explicitly set to " + t_h + ", is instead: " + cur_h );
 				}
 
 				if ( t_h === "show" ) {
 					old_h = jQuery.css( elem, "height" );
-					jQuery( elem ).append( "<br/>Some more text<br/>and some more..." );
+					jQuery( elem ).append("<br/>Some more text<br/>and some more...");
 
 					if ( /Auto/.test( fn ) ) {
-						assert.notEqual( jQuery.css( elem, "height" ), old_h, "Make sure height is auto." );
+						notEqual( jQuery.css( elem, "height" ), old_h, "Make sure height is auto." );
 					} else {
-						assert.equal( jQuery.css( elem, "height" ), old_h, "Make sure height is not auto." );
+						equal( jQuery.css( elem, "height" ), old_h, "Make sure height is not auto." );
 					}
 				}
 
 				// manually remove generated element
 				jQuery( elem ).remove();
 
-			} );
+			});
 			this.clock.tick( 50 );
-		} );
-	} );
-} );
+		});
+	});
+});
 
-QUnit.test( "Effects chaining", function( assert ) {
+test("Effects chaining", function() {
 	var remaining = 16,
 		props = [ "opacity", "height", "width", "display", "overflow" ],
 		setup = function( name, selector ) {
 			var $el = jQuery( selector );
-			return $el.data( getProps( $el[ 0 ] ) ).data( "name", name );
+			return $el.data( getProps( $el[0] ) ).data( "name", name );
 		},
-		check = function() {
+		assert = function() {
 			var data = jQuery.data( this ),
 				name = data.name;
 			delete data.name;
 
-			assert.deepEqual( getProps( this ), data, name );
+			deepEqual( getProps( this ), data, name );
 
 			jQuery.removeData( this );
 		},
@@ -1066,39 +1034,39 @@ QUnit.test( "Effects chaining", function( assert ) {
 			var obj = {};
 			jQuery.each( props, function( i, prop ) {
 				obj[ prop ] = prop === "overflow" && hiddenOverflow ? "hidden" : el.style[ prop ] || jQuery.css( el, prop );
-			} );
+			});
 			return obj;
 		};
 
-	assert.expect( remaining );
-
-	setup( ".fadeOut().fadeIn()", "#fadein div" ).fadeOut( "fast" ).fadeIn( "fast", check );
-	setup( ".fadeIn().fadeOut()", "#fadeout div" ).fadeIn( "fast" ).fadeOut( "fast", check );
-	setup( ".hide().show()", "#show div" ).hide( "fast" ).show( "fast", check );
-	setup( ".show().hide()", "#hide div" ).show( "fast" ).hide( "fast", check );
-	setup( ".show().hide(easing)", "#easehide div" ).show( "fast" ).hide( "fast", "linear", check );
-	setup( ".toggle().toggle() - in", "#togglein div" ).toggle( "fast" ).toggle( "fast", check );
-	setup( ".toggle().toggle() - out", "#toggleout div" ).toggle( "fast" ).toggle( "fast", check );
-	setup( ".toggle().toggle(easing) - out", "#easetoggleout div" ).toggle( "fast" ).toggle( "fast", "linear", check );
-	setup( ".slideDown().slideUp()", "#slidedown div" ).slideDown( "fast" ).slideUp( "fast", check );
-	setup( ".slideUp().slideDown()", "#slideup div" ).slideUp( "fast" ).slideDown( "fast", check );
-	setup( ".slideUp().slideDown(easing)", "#easeslideup div" ).slideUp( "fast" ).slideDown( "fast", "linear", check );
-	setup( ".slideToggle().slideToggle() - in", "#slidetogglein div" ).slideToggle( "fast" ).slideToggle( "fast", check );
-	setup( ".slideToggle().slideToggle() - out", "#slidetoggleout div" ).slideToggle( "fast" ).slideToggle( "fast", check );
-	setup( ".fadeToggle().fadeToggle() - in", "#fadetogglein div" ).fadeToggle( "fast" ).fadeToggle( "fast", check );
-	setup( ".fadeToggle().fadeToggle() - out", "#fadetoggleout div" ).fadeToggle( "fast" ).fadeToggle( "fast", check );
-	setup( ".fadeTo(0.5).fadeTo(1.0, easing)", "#fadeto div" ).fadeTo( "fast", 0.5 ).fadeTo( "fast", 1.0, "linear", check );
+	expect( remaining );
+
+	setup( ".fadeOut().fadeIn()", "#fadein div" ).fadeOut("fast").fadeIn( "fast", assert );
+	setup( ".fadeIn().fadeOut()", "#fadeout div" ).fadeIn("fast").fadeOut( "fast", assert );
+	setup( ".hide().show()", "#show div" ).hide("fast").show( "fast", assert );
+	setup( ".show().hide()", "#hide div" ).show("fast").hide( "fast", assert );
+	setup( ".show().hide(easing)", "#easehide div" ).show("fast").hide( "fast", "linear", assert );
+	setup( ".toggle().toggle() - in", "#togglein div" ).toggle("fast").toggle( "fast", assert );
+	setup( ".toggle().toggle() - out", "#toggleout div" ).toggle("fast").toggle( "fast", assert );
+	setup( ".toggle().toggle(easing) - out", "#easetoggleout div" ).toggle("fast").toggle( "fast", "linear", assert );
+	setup( ".slideDown().slideUp()", "#slidedown div" ).slideDown("fast").slideUp( "fast", assert );
+	setup( ".slideUp().slideDown()", "#slideup div" ).slideUp("fast").slideDown( "fast", assert );
+	setup( ".slideUp().slideDown(easing)", "#easeslideup div" ).slideUp("fast").slideDown( "fast", "linear", assert );
+	setup( ".slideToggle().slideToggle() - in", "#slidetogglein div" ).slideToggle("fast").slideToggle( "fast", assert );
+	setup( ".slideToggle().slideToggle() - out", "#slidetoggleout div" ).slideToggle("fast").slideToggle( "fast", assert );
+	setup( ".fadeToggle().fadeToggle() - in", "#fadetogglein div" ).fadeToggle("fast").fadeToggle( "fast", assert );
+	setup( ".fadeToggle().fadeToggle() - out", "#fadetoggleout div" ).fadeToggle("fast").fadeToggle( "fast", assert );
+	setup( ".fadeTo(0.5).fadeTo(1.0, easing)", "#fadeto div" ).fadeTo( "fast", 0.5 ).fadeTo( "fast", 1.0, "linear", assert );
         this.clock.tick( 400 );
-} );
+});
 
-jQuery.makeTest = function( text ) {
-        var elem = jQuery( "<div></div>" )
+jQuery.makeTest = function( text ){
+        var elem = jQuery("<div></div>")
                 .attr( "id", "test" + jQuery.makeTest.id++ )
-                .addClass( "box" );
+                .addClass("box");
 
-        jQuery( "<h4></h4>" )
+        jQuery("<h4></h4>")
                 .text( text )
-                .appendTo( "#fx-tests" )
+                .appendTo("#fx-tests")
                 .after( elem );
 
         return elem;
@@ -1106,84 +1074,83 @@ jQuery.makeTest = function( text ) {
 
 jQuery.makeTest.id = 1;
 
-QUnit.test( "jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function( assert ) {
-	assert.expect( 4 );
+test("jQuery.show('fast') doesn't clear radio buttons (bug #1095)", function () {
+	expect(4);
 
-	var $checkedtest = jQuery( "#checkedtest" );
-	$checkedtest.hide().show( "fast", function() {
-		assert.ok( jQuery( "input[type='radio']", $checkedtest ).first().attr( "checked" ), "Check first radio still checked." );
-		assert.ok( !jQuery( "input[type='radio']", $checkedtest ).last().attr( "checked" ), "Check last radio still NOT checked." );
-		assert.ok( jQuery( "input[type='checkbox']", $checkedtest ).first().attr( "checked" ), "Check first checkbox still checked." );
-		assert.ok( !jQuery( "input[type='checkbox']", $checkedtest ).last().attr( "checked" ), "Check last checkbox still NOT checked." );
-	} );
+	var $checkedtest = jQuery("#checkedtest");
+	$checkedtest.hide().show("fast", function() {
+		ok( jQuery("input[type='radio']", $checkedtest).first().attr("checked"), "Check first radio still checked." );
+		ok( !jQuery("input[type='radio']", $checkedtest).last().attr("checked"), "Check last radio still NOT checked." );
+		ok( jQuery("input[type='checkbox']", $checkedtest).first().attr("checked"), "Check first checkbox still checked." );
+		ok( !jQuery("input[type='checkbox']", $checkedtest).last().attr("checked"), "Check last checkbox still NOT checked." );
+	});
 	this.clock.tick( 200 );
-} );
+});
 
-QUnit.test( "interrupt toggle", function( assert ) {
-	assert.expect( 24 );
+test( "interrupt toggle", function() {
+	expect( 24 );
 
 	var env = this,
 		longDuration = 2000,
 		shortDuration = 500,
 		remaining = 0,
-		$elems = jQuery( ".chain-test" ),
+		$elems = jQuery(".chain-test"),
 		clock = this.clock,
 		finish = function() {
 		};
 
 	jQuery.each( { slideToggle: "height", fadeToggle: "opacity", toggle: "width" }, function( method, prop ) {
-		var $methodElems = $elems.filter( "[id^='" + method.toLowerCase() + "']" ).each( function() {
-
+		var $methodElems = $elems.filter( "[id^='" + method.toLowerCase() + "']" ).each(function() {
 			// Don't end test until we're done with this element
 			remaining++;
 
 			// Save original property value for comparison
 			jQuery.data( this, "startVal", jQuery( this ).css( prop ) );
 
-			// Expect display data from our .hide() call below
-			assert.expectJqData( env, this, "display" );
-		} );
+			// Expect olddisplay data from our .hide() call below
+			QUnit.expectJqData( env, this, "olddisplay" );
+		});
 
 		// Interrupt a hiding toggle
 		$methodElems[ method ]( longDuration );
-		setTimeout( function() {
-			$methodElems.stop().each( function() {
-				assert.notEqual( jQuery( this ).css( prop ), jQuery.data( this, "startVal" ), ".stop() before completion of hiding ." + method + "() - #" + this.id );
-			} );
+		setTimeout(function() {
+			$methodElems.stop().each(function() {
+				notEqual( jQuery( this ).css( prop ), jQuery.data( this, "startVal" ), ".stop() before completion of hiding ." + method + "() - #" + this.id );
+			});
 
 			// Restore
 			$methodElems[ method ]( shortDuration, function() {
 				var id = this.id,
 					$elem = jQuery( this ),
-					startVal = $elem.data( "startVal" );
+					startVal = $elem.data("startVal");
 
-				$elem.removeData( "startVal" );
+				$elem.removeData("startVal");
 
-				assert.equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id );
+				equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id );
 
 				// Interrupt a showing toggle
 				$elem.hide()[ method ]( longDuration );
-				setTimeout( function() {
+				setTimeout(function() {
 					$elem.stop();
-					assert.notEqual( $elem.css( prop ), startVal, ".stop() before completion of showing ." + method + "() - #" + id );
+					notEqual( $elem.css( prop ), startVal, ".stop() before completion of showing ." + method + "() - #" + id );
 
 					// Restore
 					$elem[ method ]( shortDuration, function() {
-						assert.equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id );
+						equal( $elem.css( prop ), startVal, "original value restored by ." + method + "() - #" + id );
 						finish();
-					} );
+					});
 				}, shortDuration );
-			} );
+			});
 		}, shortDuration );
-	} );
+	});
 	clock.tick( longDuration );
 
 	// FIXME untangle the set timeouts
-} );
+});
 
-QUnit.test( "animate with per-property easing", function( assert ) {
+test( "animate with per-property easing", function() {
 
-	assert.expect( 5 );
+	expect( 5 );
 
 	var data = { a: 0, b: 0, c: 0 },
 		test1Called = false,
@@ -1211,147 +1178,143 @@ QUnit.test( "animate with per-property easing", function( assert ) {
 	};
 
 	jQuery( data ).animate( props, 400, "_defaultTest", function() {
-		assert.ok( test1Called, "Easing function (_test1) called" );
-		assert.ok( test2Called, "Easing function (_test2) called" );
-		assert.ok( defaultTestCalled, "Easing function (_default) called" );
-		assert.equal( props.a[ 1 ], "_test1", "animate does not change original props (per-property easing would be lost)" );
-		assert.equal( props.b[ 1 ], "_test2", "animate does not change original props (per-property easing would be lost)" );
-	} );
+		ok( test1Called, "Easing function (_test1) called" );
+		ok( test2Called, "Easing function (_test2) called" );
+		ok( defaultTestCalled, "Easing function (_default) called" );
+		equal( props.a[ 1 ], "_test1", "animate does not change original props (per-property easing would be lost)" );
+		equal( props.b[ 1 ], "_test2", "animate does not change original props (per-property easing would be lost)" );
+	});
 
 	this.clock.tick( 400 );
-} );
+});
 
-QUnit.test( "animate with CSS shorthand properties", function( assert ) {
-	assert.expect( 11 );
+test("animate with CSS shorthand properties", function(){
+	expect(11);
 
 	var easeAnimation_count = 0,
 		easeProperty_count = 0,
 		propsBasic = { "padding": "10 20 30" },
 		propsSpecial = { "padding": [ "1 2 3", "propertyScope" ] };
 
-	jQuery.easing.animationScope = function( p ) {
+	jQuery.easing.animationScope = function(p) {
 		if ( p >= 1 ) {
 			easeAnimation_count++;
 		}
 		return p;
 	};
 
-	jQuery.easing.propertyScope = function( p ) {
+	jQuery.easing.propertyScope = function(p) {
 		if ( p >= 1 ) {
 			easeProperty_count++;
 		}
 		return p;
 	};
 
-	jQuery( "#foo" )
+	jQuery("#foo")
 		.animate( propsBasic, 200, "animationScope", function() {
-			assert.equal( this.style.paddingTop, "10px", "padding-top was animated" );
-			assert.equal( this.style.paddingLeft, "20px", "padding-left was animated" );
-			assert.equal( this.style.paddingRight, "20px", "padding-right was animated" );
-			assert.equal( this.style.paddingBottom, "30px", "padding-bottom was animated" );
-			assert.equal( easeAnimation_count, 4, "per-animation default easing called for each property" );
+			equal( this.style.paddingTop, "10px", "padding-top was animated" );
+			equal( this.style.paddingLeft, "20px", "padding-left was animated" );
+			equal( this.style.paddingRight, "20px", "padding-right was animated" );
+			equal( this.style.paddingBottom, "30px", "padding-bottom was animated" );
+			equal( easeAnimation_count, 4, "per-animation default easing called for each property" );
 			easeAnimation_count = 0;
-		} )
+		})
 		.animate( propsSpecial, 200, "animationScope", function() {
-			assert.equal( this.style.paddingTop, "1px", "padding-top was animated again" );
-			assert.equal( this.style.paddingLeft, "2px", "padding-left was animated again" );
-			assert.equal( this.style.paddingRight, "2px", "padding-right was animated again" );
-			assert.equal( this.style.paddingBottom, "3px", "padding-bottom was animated again" );
-			assert.equal( easeAnimation_count, 0, "per-animation default easing not called" );
-			assert.equal( easeProperty_count, 4, "special easing called for each property" );
-
-			jQuery( this ).css( "padding", "0" );
+			equal( this.style.paddingTop, "1px", "padding-top was animated again" );
+			equal( this.style.paddingLeft, "2px", "padding-left was animated again" );
+			equal( this.style.paddingRight, "2px", "padding-right was animated again" );
+			equal( this.style.paddingBottom, "3px", "padding-bottom was animated again" );
+			equal( easeAnimation_count, 0, "per-animation default easing not called" );
+			equal( easeProperty_count, 4, "special easing called for each property" );
+
+			jQuery(this).css("padding", "0");
 			delete jQuery.easing.animationScope;
 			delete jQuery.easing.propertyScope;
-		} );
+		});
 		this.clock.tick( 400 );
-} );
+});
 
-QUnit.test( "hide hidden elements, with animation (bug #7141)", function( assert ) {
-	assert.expect( 3 );
+test("hide hidden elements, with animation (bug #7141)", function() {
+	expect(3);
 
-	var div = jQuery( "<div style='display:none'></div>" ).appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "display" ), "none", "Element is hidden by default" );
-	div.hide( 1, function() {
-		assert.ok( !jQuery._data( div, "display" ), "display data is undefined after hiding an already-hidden element" );
-		div.show( 1, function() {
-			assert.equal( div.css( "display" ), "block", "Show a double-hidden element" );
-		} );
-	} );
-	this.clock.tick( 10 );
-} );
 
-QUnit.test( "animate unit-less properties (#4966)", function( assert ) {
-	assert.expect( 2 );
+	var div = jQuery("<div style='display:none'></div>").appendTo("#qunit-fixture");
+	equal( div.css("display"), "none", "Element is hidden by default" );
+	div.hide(1, function () {
+		ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+		div.show(1, function () {
+			equal( div.css("display"), "block", "Show a double-hidden element" );
+		});
+	});
+	this.clock.tick( 10 );
+});
 
+test("animate unit-less properties (#4966)", 2, function() {
 	var div = jQuery( "<div style='z-index: 0; position: absolute;'></div>" ).appendTo( "#qunit-fixture" );
-	assert.equal( div.css( "z-index" ), "0", "z-index is 0" );
-	div.animate( { zIndex: 2 }, function() {
-		assert.equal( div.css( "z-index" ), "2", "z-index is 2" );
-	} );
+	equal( div.css( "z-index" ), "0", "z-index is 0" );
+	div.animate({ zIndex: 2 }, function() {
+		equal( div.css( "z-index" ), "2", "z-index is 2" );
+	});
 	this.clock.tick( 400 );
-} );
-
-QUnit.test( "animate properties missing px w/ opacity as last (#9074)", function( assert ) {
-	assert.expect( 2 );
+});
 
-	assert.expect( 6 );
+test( "animate properties missing px w/ opacity as last (#9074)", 2, function() {
+	expect( 6 );
 	var ml, l,
 		div = jQuery( "<div style='position: absolute; margin-left: 0; left: 0px;'></div>" )
 		.appendTo( "#qunit-fixture" );
 	function cssInt( prop ) {
 		return parseInt( div.css( prop ), 10 );
 	}
-	assert.equal( cssInt( "marginLeft" ), 0, "Margin left is 0" );
-	assert.equal( cssInt( "left" ), 0, "Left is 0" );
-	div.animate( {
+	equal( cssInt( "marginLeft" ), 0, "Margin left is 0" );
+	equal( cssInt( "left" ), 0, "Left is 0" );
+	div.animate({
 		left: 200,
 		marginLeft: 200,
 		opacity: 0
-	}, 2000 );
+	}, 2000);
 
 	this.clock.tick( 500 );
 
 	ml = cssInt( "marginLeft" );
 	l = cssInt( "left" );
-	assert.notEqual( ml, 0, "Margin left is not 0 after partial animate" );
-	assert.notEqual( ml, 200, "Margin left is not 200 after partial animate" );
-	assert.notEqual( l, 0, "Left is not 0 after partial animate" );
-	assert.notEqual( l, 200, "Left is not 200 after partial animate" );
+	notEqual( ml, 0, "Margin left is not 0 after partial animate" );
+	notEqual( ml, 200, "Margin left is not 200 after partial animate" );
+	notEqual( l, 0, "Left is not 0 after partial animate" );
+	notEqual( l, 200, "Left is not 200 after partial animate" );
 	div.stop().remove();
-} );
+});
 
-QUnit.test( "callbacks should fire in correct order (#9100)", function( assert ) {
-	assert.expect( 1 );
+test("callbacks should fire in correct order (#9100)", function() {
+	expect( 1 );
 
 	var a = 1,
 		cb = 0;
 
-	jQuery( "<p data-operation='*2'></p><p data-operation='^2'></p>" )
-		.appendTo( "#qunit-fixture" )
-
+	jQuery("<p data-operation='*2'></p><p data-operation='^2'></p>")
+		.appendTo("#qunit-fixture")
 		// The test will always pass if no properties are animated or if the duration is 0
-		.animate( { fontSize: 12 }, 13, function() {
-			a *= jQuery( this ).data( "operation" ) === "*2" ? 2 : a;
+		.animate({ fontSize: 12 }, 13, function() {
+			a *= jQuery(this).data("operation") === "*2" ? 2 : a;
 			cb++;
 			if ( cb === 2 ) {
-				assert.equal( a, 4, "test value has been *2 and _then_ ^2" );
+				equal( a, 4, "test value has been *2 and _then_ ^2");
 			}
-		} );
+		});
 	this.clock.tick( 20 );
-} );
+});
 
-QUnit.test( "callbacks that throw exceptions will be removed (#5684)", function( assert ) {
-	assert.expect( 2 );
+test( "callbacks that throw exceptions will be removed (#5684)", function() {
+	expect( 2 );
 
 	var foo = jQuery( "#foo" );
 
 	function TestException() {
 	}
 
-	foo.animate( { height: 1 }, 1, function() {
+	foo.animate({ height: 1 }, 1, function() {
 		throw new TestException();
-	} );
+	});
 
 	// this test thoroughly abuses undocumented methods - please feel free to update
 	// with any changes internally to these functions.
@@ -1360,60 +1323,55 @@ QUnit.test( "callbacks that throw exceptions will be removed (#5684)", function(
 	jQuery.fx.stop();
 
 	this.clock.tick( 1 );
-	assert.throws( jQuery.fx.tick, TestException, "Exception was thrown" );
+	throws( jQuery.fx.tick, TestException, "Exception was thrown" );
 
 	// the second call shouldn't
 	jQuery.fx.tick();
 
-	assert.ok( true, "Test completed without throwing a second exception" );
+	ok( true, "Test completed without throwing a second exception" );
 
-} );
+});
 
-QUnit.test( "animate will scale margin properties individually", function( assert ) {
-	assert.expect( 2 );
+test("animate will scale margin properties individually", function() {
+	expect( 2 );
 
-	var foo = jQuery( "#foo" ).css( {
+	var foo = jQuery( "#foo" ).css({
 		"margin": 0,
 		"marginLeft": 100
-	} );
+	});
 
-	assert.ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "Sanity Check" );
+	ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "Sanity Check" );
 
-	foo.animate( {
+	foo.animate({
 		"margin": 200
-	} ).stop();
+	}).stop();
 
-	assert.ok( foo.css( "marginLeft" ) !== foo.css( "marginRight" ), "The margin properties are different" );
+	ok( foo.css( "marginLeft") !== foo.css( "marginRight" ), "The margin properties are different");
 
 	// clean up for next test
-	foo.css( {
+	foo.css({
 		"marginLeft": "",
 		"marginRight": "",
 		"marginTop": "",
 		"marginBottom": ""
-	} );
-} );
-
-QUnit.test( "Do not append px to 'fill-opacity' #9548", function( assert ) {
-	assert.expect( 1 );
-
-	var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" );
+	});
+});
 
-	$div.css( "fill-opacity", 0 ).animate( { "fill-opacity": 1.0 }, 0, function() {
+test("Do not append px to 'fill-opacity' #9548", 1, function() {
+	var $div = jQuery("<div>").appendTo("#qunit-fixture");
 
+	$div.css("fill-opacity", 0).animate({ "fill-opacity": 1.0 }, 0, function () {
 		// Support: Android 2.3 (no support for fill-opacity)
 		if ( jQuery( this ).css( "fill-opacity" ) ) {
-			assert.equal( jQuery( this ).css( "fill-opacity" ), 1, "Do not append px to 'fill-opacity'" );
+			equal( jQuery( this ).css( "fill-opacity" ), 1, "Do not append px to 'fill-opacity'" );
 		} else {
-			assert.ok( true, "No support for fill-opacity CSS property" );
+			ok( true, "No support for fill-opacity CSS property" );
 		}
 		$div.remove();
-	} );
-} );
-
-QUnit.test( "line-height animates correctly (#13855)", function( assert ) {
-	assert.expect( 12 );
+	});
+});
 
+test("line-height animates correctly (#13855)", 12, function() {
 	var t0,
 		clock = this.clock,
 		longDuration = 2000,
@@ -1423,61 +1381,59 @@ QUnit.test( "line-height animates correctly (#13855)", function( assert ) {
 			"<p style='line-height: 5000px;'>px</p>" +
 			"<p style='line-height: 5000%;'>percent</p>" +
 			"<p style='line-height: 100em;'>em</p>"
-		).appendTo( "#qunit-fixture" ),
+		).appendTo("#qunit-fixture"),
 		initialHeight = jQuery.map( animated, function( el ) {
 			return jQuery( el ).height();
-		} ),
+		}),
 		tolerance = 1.5;
 
 	// Delay start to improve test stability
-	setTimeout( function() {
+	setTimeout(function() {
 
-		t0 = +( new Date() );
+		t0 = +(new Date());
 		animated.animate( { "line-height": "hide" }, longDuration, "linear" );
 
-		setTimeout( function() {
-			var progress = ( ( new Date() ) - t0 ) / longDuration;
+		setTimeout(function() {
+			var progress = ( (new Date()) - t0 ) / longDuration;
 
-			animated.each( function( i ) {
+			animated.each(function( i ) {
 				var label = jQuery.text( this ),
 					initial = initialHeight[ i ],
 					height = jQuery( this ).height(),
 					lower = initial * ( 1 - progress ) / tolerance;
-				assert.ok( height < initial, "hide " + label + ": upper bound; " +
+				ok( height < initial, "hide " + label + ": upper bound; " +
 					height + " < " + initial + " @ " + ( progress * 100 ) + "%" );
-				assert.ok( height > lower, "hide " + label + ": lower bound; "  +
+				ok( height > lower, "hide " + label + ": lower bound; "  +
 					height + " > " + lower + " @ " + ( progress * 100 ) + "%" );
-			} );
+			});
 
-			t0 = +( new Date() );
+			t0 = +(new Date());
 			animated.stop( true, true ).hide()
 					.animate( { "line-height": "show" }, longDuration, "linear" );
 
-			setTimeout( function() {
-				var progress = ( ( new Date() ) - t0 ) / longDuration;
+			setTimeout(function() {
+				var progress = ( (new Date()) - t0 ) / longDuration;
 
-				animated.each( function( i ) {
+				animated.each(function( i ) {
 					var label = jQuery.text( this ),
 						initial = initialHeight[ i ],
 						height = jQuery( this ).height(),
 						upper = initial * progress * tolerance;
-					assert.ok( height < upper, "show " + label + ": upper bound; " +
+					ok( height < upper, "show " + label + ": upper bound; " +
 						height + " < " + upper + " @ " + ( progress * 100 ) + "%" );
-				} );
+				});
 
 				animated.stop( true, true );
 			}, shortDuration );
-clock.tick( shortDuration );
+clock.tick(shortDuration);
 		}, shortDuration );
-clock.tick( shortDuration );
+clock.tick(shortDuration);
 	}, 50 );
 clock.tick( 50 );
-} );
+});
 
 // Start 1.8 Animation tests
-QUnit.test( "jQuery.Animation( object, props, opts )", function( assert ) {
-	assert.expect( 4 );
-
+test( "jQuery.Animation( object, props, opts )", 4, function() {
 	var animation,
 		testObject = {
 			"foo": 0,
@@ -1490,23 +1446,21 @@ QUnit.test( "jQuery.Animation( object, props, opts )", function( assert ) {
 			"width": 200
 		};
 
-	animation = jQuery.Animation( testObject, testDest, { "duration": 1 } );
-	animation.done( function() {
+	animation = jQuery.Animation( testObject, testDest, { "duration": 1 });
+	animation.done(function() {
 		for ( var prop in testDest ) {
-			assert.equal( testObject[ prop ], testDest[ prop ], "Animated: " + prop );
+			equal( testObject[ prop ], testDest[ prop ], "Animated: " + prop );
 		}
-		animation.done( function() {
-			assert.deepEqual( testObject, testDest, "No unexpected properties" );
-		} );
-	} );
+		animation.done(function() {
+			deepEqual( testObject, testDest, "No unexpected properties" );
+		});
+	});
 	this.clock.tick( 10 );
-} );
-
-QUnit.test( "Animate Option: step: function( percent, tween )", function( assert ) {
-	assert.expect( 1 );
+});
 
+test( "Animate Option: step: function( percent, tween )", 1, function() {
 	var counter = {};
-	jQuery( "#foo" ).animate( {
+	jQuery( "#foo" ).animate({
 		prop1: 1,
 		prop2: 2,
 		prop3: 3
@@ -1514,136 +1468,130 @@ QUnit.test( "Animate Option: step: function( percent, tween )", function( assert
 		duration: 1,
 		step: function( value, tween ) {
 			var calls = counter[ tween.prop ] = counter[ tween.prop ] || [];
-
 			// in case this is called multiple times for either, lets store it in
 			// 0 or 1 in the array
 			calls[ value === 0 ? 0 : 1 ] = value;
 		}
-	} ).queue( function( next ) {
-		assert.deepEqual( counter, {
-			prop1: [ 0, 1 ],
-			prop2: [ 0, 2 ],
-			prop3: [ 0, 3 ]
-		}, "Step function was called once at 0% and once at 100% for each property" );
+	}).queue( function( next ) {
+		deepEqual( counter, {
+			prop1: [0, 1],
+			prop2: [0, 2],
+			prop3: [0, 3]
+		}, "Step function was called once at 0% and once at 100% for each property");
 		next();
-	} );
+	});
 	this.clock.tick( 10 );
-} );
-
-QUnit.test( "Animate callbacks have correct context", function( assert ) {
-	assert.expect( 2 );
+});
 
+test( "Animate callbacks have correct context", 2, function() {
 	var foo = jQuery( "#foo" );
-	foo.animate( {
+	foo.animate({
 		height: 10
 	}, 10, function() {
-		assert.equal( foo[ 0 ], this, "Complete callback after stop(true) `this` is element" );
-	} ).stop( true, true );
-	foo.animate( {
+		equal( foo[ 0 ], this, "Complete callback after stop(true) `this` is element" );
+	}).stop( true, true );
+	foo.animate({
 		height: 100
 	}, 10, function() {
-		assert.equal( foo[ 0 ], this, "Complete callback `this` is element" );
-	} );
+		equal( foo[ 0 ], this, "Complete callback `this` is element" );
+	});
 	this.clock.tick( 10 );
-} );
-
-QUnit.test( "User supplied callback called after show when fx off (#8892)", function( assert ) {
-	assert.expect( 2 );
+});
 
+test( "User supplied callback called after show when fx off (#8892)", 2, function() {
 	var foo = jQuery( "#foo" );
 	jQuery.fx.off = true;
 	foo.hide();
 	foo.fadeIn( 500, function() {
-		assert.ok( jQuery( this ).is( ":visible" ), "Element is visible in callback" );
+		ok( jQuery( this ).is( ":visible" ), "Element is visible in callback" );
 		foo.fadeOut( 500, function() {
-			assert.ok( jQuery( this ).is( ":hidden" ), "Element is hidden in callback" );
+			ok( jQuery( this ).is( ":hidden" ), "Element is hidden in callback" );
 			jQuery.fx.off = false;
-		} );
-	} );
+		});
+	});
 	this.clock.tick( 1000 );
-} );
+});
 
-QUnit.test( "animate should set display for disconnected nodes", function( assert ) {
-	assert.expect( 20 );
+test( "animate should set display for disconnected nodes", function() {
+	expect( 18 );
 
-	var methods = {
+	var env = this,
+		methods = {
 			toggle: [ 1 ],
 			slideToggle: [],
 			fadeIn: [],
 			fadeTo: [ "fast", 0.5 ],
 			slideDown: [ "fast" ],
 			show: [ 1 ],
-			animate: [ { width: "show" } ]
+			animate: [{ width: "show" }]
 		},
-		$divEmpty = jQuery( "<div/>" ),
-		$divTest = jQuery( "<div>test</div>" ),
-		$divNone = jQuery( "<div style='display: none;'/>" ),
-		$divInline = jQuery( "<div style='display: inline;'/>" ),
-		nullParentDisplay = $divEmpty.css( "display" ),
-		underFragmentDisplay = $divTest.css( "display" ),
+		$divTest = jQuery("<div>test</div>"),
+		// parentNode = null
+		$divEmpty = jQuery("<div/>"),
+		$divNone = jQuery("<div style='display: none;'/>"),
+		$divInline = jQuery("<div style='display: inline;'/>"),
 		clock = this.clock;
 
-	assert.strictEqual( $divEmpty[ 0 ].parentNode, null, "Setup: element with null parentNode" );
-	assert.strictEqual( ( $divTest[ 0 ].parentNode || {} ).nodeType, 11, "Setup: element under fragment" );
+	strictEqual( $divTest.show()[ 0 ].style.display, "block", "set display with show() for element with parentNode = document fragment" );
+	strictEqual( $divEmpty.show()[ 0 ].style.display, "block", "set display with show() for element with parentNode = null" );
+	strictEqual( $divNone.show()[ 0 ].style.display, "block", "show() should change display if it already set to none" );
+	strictEqual( $divInline.show()[ 0 ].style.display, "inline", "show() should not change display if it already set" );
 
-	assert.strictEqual( $divEmpty.show()[ 0 ].style.display, "",
-		"set display with show() for element with null parentNode" );
-	assert.strictEqual( $divTest.show()[ 0 ].style.display, "",
-		"set display with show() for element under fragment" );
-	assert.strictEqual( $divNone.show()[ 0 ].style.display, "",
-		"show() should change display if it already set to none" );
-	assert.strictEqual( $divInline.show()[ 0 ].style.display, "inline",
-		"show() should not change display if it already set" );
+	QUnit.expectJqData( env, $divTest[ 0 ], "olddisplay" );
+	QUnit.expectJqData( env, $divEmpty[ 0 ], "olddisplay" );
+	QUnit.expectJqData( env, $divNone[ 0 ], "olddisplay" );
 
 	jQuery.each( methods, function( name, opt ) {
-		jQuery.fn[ name ].apply( jQuery( "<div/>" ), opt.concat( [ function() {
-			assert.strictEqual( jQuery( this ).css( "display" ), nullParentDisplay,
-				"." + name + " block with null parentNode" );
-		} ] ) );
-
-		jQuery.fn[ name ].apply( jQuery( "<div>test</div>" ), opt.concat( [ function() {
-			assert.strictEqual( jQuery( this ).css( "display" ), underFragmentDisplay,
-				"." + name + " block under fragment" );
-		} ] ) );
-	} );
-	clock.tick( 400 );
-} );
+		jQuery.each([
 
-QUnit.test( "Animation callback should not show animated element as :animated (#7157)", function( assert ) {
-	assert.expect( 1 );
+			// parentNode = document fragment
+			jQuery("<div>test</div>"),
+
+			// parentNode = null
+			jQuery("<div/>")
+
+		], function() {
+			var callback = [function () {
+					strictEqual( this.style.display, "block", "set display to block with " + name );
+
+					QUnit.expectJqData( env, this, "olddisplay" );
+
+			}];
+			jQuery.fn[ name ].apply( this, opt.concat( callback ) );
+		});
+	});
+        clock.tick( 400 );
+});
 
+test("Animation callback should not show animated element as :animated (#7157)", 1, function() {
 	var foo = jQuery( "#foo" );
 
-	foo.animate( {
+	foo.animate({
 		opacity: 0
 	}, 100, function() {
-		assert.ok( !foo.is( ":animated" ), "The element is not animated" );
-	} );
+		ok( !foo.is(":animated"), "The element is not animated" );
+	});
 	this.clock.tick( 100 );
-} );
-
-QUnit.test( "Initial step callback should show element as :animated (#14623)", function( assert ) {
-	assert.expect( 1 );
+});
 
+test("Initial step callback should show element as :animated (#14623)", 1, function() {
 	var foo = jQuery( "#foo" );
 
-	foo.animate( {
+	foo.animate({
 		opacity: 0
 	}, {
 		duration: 100,
 		step: function() {
-			assert.ok( foo.is( ":animated" ), "The element matches :animated inside step function" );
+			ok( foo.is(":animated"), "The element matches :animated inside step function" );
 		}
-	} );
+	});
 	this.clock.tick( 1 );
 	foo.stop();
-} );
-
-QUnit.test( "hide called on element within hidden parent should set display to none (#10045)", function( assert ) {
-	assert.expect( 3 );
+});
 
-	var hidden = jQuery( ".hidden" ),
-		elems = jQuery( "<div>hide</div><div>hide0</div><div>hide1</div>" );
+test( "hide called on element within hidden parent should set display to none (#10045)", 3, function() {
+	var hidden = jQuery(".hidden"),
+		elems = jQuery("<div>hide</div><div>hide0</div><div>hide1</div>");
 
 	hidden.append( elems );
 
@@ -1651,25 +1599,23 @@ QUnit.test( "hide called on element within hidden parent should set display to n
 		elems.eq( 0 ).hide(),
 		elems.eq( 1 ).hide( 0 ),
 		elems.eq( 2 ).hide( 1 )
-	).done( function() {
-		assert.strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element within hidden parent should set display to none" );
-		assert.strictEqual( elems.get( 1 ).style.display, "none", "hide( 0 ) called on element within hidden parent should set display to none" );
-		assert.strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element within hidden parent should set display to none" );
+	).done(function() {
+		strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element within hidden parent should set display to none" );
+		strictEqual( elems.get( 1 ).style.display, "none", "hide( 0 ) called on element within hidden parent should set display to none" );
+		strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element within hidden parent should set display to none" );
 
 		elems.remove();
-	} );
+	});
 	this.clock.tick( 10 );
-} );
-
-QUnit.test( "hide, fadeOut and slideUp called on element width height and width = 0 should set display to none", function( assert ) {
-	assert.expect( 5 );
+});
 
-	var foo = jQuery( "#foo" ),
+test( "hide, fadeOut and slideUp called on element width height and width = 0 should set display to none", 5, function() {
+	var foo = jQuery("#foo"),
 		i = 0,
 		elems = jQuery();
 
 	for ( ; i < 5; i++ ) {
-		elems = elems.add( "<div style='width:0;height:0;'></div>" );
+		elems = elems.add("<div style='width:0;height:0;'></div>");
 	}
 
 	foo.append( elems );
@@ -1680,156 +1626,145 @@ QUnit.test( "hide, fadeOut and slideUp called on element width height and width
 		elems.eq( 2 ).hide( 1 ),
 		elems.eq( 3 ).fadeOut(),
 		elems.eq( 4 ).slideUp()
-	).done( function() {
-		assert.strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element width height and width = 0 should set display to none" );
-		assert.strictEqual( elems.get( 1 ).style.display, "none",
+	).done(function() {
+		strictEqual( elems.get( 0 ).style.display, "none", "hide() called on element width height and width = 0 should set display to none" );
+		strictEqual( elems.get( 1 ).style.display, "none",
 												"hide( jQuery.noop ) called on element width height and width = 0 should set display to none" );
-		assert.strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element width height and width = 0 should set display to none" );
-		assert.strictEqual( elems.get( 3 ).style.display, "none", "fadeOut() called on element width height and width = 0 should set display to none" );
-		assert.strictEqual( elems.get( 4 ).style.display, "none", "slideUp() called on element width height and width = 0 should set display to none" );
+		strictEqual( elems.get( 2 ).style.display, "none", "hide( 1 ) called on element width height and width = 0 should set display to none" );
+		strictEqual( elems.get( 3 ).style.display, "none", "fadeOut() called on element width height and width = 0 should set display to none" );
+		strictEqual( elems.get( 4 ).style.display, "none", "slideUp() called on element width height and width = 0 should set display to none" );
 
-	} );
+	});
 	this.clock.tick( 400 );
-} );
-
-QUnit.test( "hide should not leave hidden inline elements visible (#14848)", function( assert ) {
-	assert.expect( 2 );
+});
 
-	var el = jQuery( "#simon1" );
+test( "hide should not leave hidden inline elements visible (#14848)", 2, function() {
+	var el = jQuery("#simon1");
 
 	el.hide( 1, function() {
-		assert.equal( el.css( "display" ), "none", "hidden" );
+		equal( el.css( "display" ), "none", "hidden" );
 		el.hide( 1, function() {
-			assert.equal( el.css( "display" ), "none", "still hidden" );
-		} );
-	} );
+			equal( el.css( "display" ), "none", "still hidden" );
+		});
+	});
 
 	this.clock.tick( 100 );
-} );
-
-QUnit.test( "Handle queue:false promises", function( assert ) {
-	assert.expect( 10 );
+});
 
+test( "Handle queue:false promises", 10, function() {
 	var foo = jQuery( "#foo" ).clone().addBack(),
 		step = 1;
 
-	foo.animate( {
+	foo.animate({
 		top: 1
 	}, {
 		duration: 10,
 		queue: false,
 		complete: function() {
-			assert.ok( step++ <= 2, "Step one or two" );
+			ok( step++ <= 2, "Step one or two" );
 		}
-	} ).animate( {
+	}).animate({
 		bottom: 1
 	}, {
 		duration: 10,
 		complete: function() {
-			assert.ok( step > 2 && step < 5, "Step three or four" );
+			ok( step > 2 && step < 5, "Step three or four" );
 			step++;
 		}
-	} );
+	});
 
 	this.clock.tick( 10 );
 
 	foo.promise().done( function() {
-		assert.equal( step++, 5, "steps 1-5: queue:false then queue:fx done" );
-		foo.animate( {
+		equal( step++, 5, "steps 1-5: queue:false then queue:fx done" );
+		foo.animate({
 			top: 10
 		}, {
 			duration: 10,
 			complete: function() {
-				assert.ok( step > 5 && step < 8, "Step six or seven" );
+				ok( step > 5 && step < 8, "Step six or seven" );
 				step++;
 			}
-		} ).animate( {
+		}).animate({
 			bottom: 10
 		}, {
 			duration: 10,
 			queue: false,
 			complete: function() {
-				assert.ok( step > 7 && step < 10, "Step eight or nine" );
+				ok( step > 7 && step < 10, "Step eight or nine" );
 				step++;
 			}
-		} ).promise().done( function() {
-			assert.equal( step++, 10, "steps 6-10: queue:fx then queue:false" );
-		} );
+		}).promise().done( function() {
+			equal( step++, 10, "steps 6-10: queue:fx then queue:false" );
+		});
 
-	} );
+	});
 	this.clock.tick( 10 );
-} );
-
-QUnit.test( "multiple unqueued and promise", function( assert ) {
-	assert.expect( 4 );
+});
 
+test( "multiple unqueued and promise", 4, function() {
 	var foo = jQuery( "#foo" ),
 		step = 1;
-	foo.animate( {
+	foo.animate({
 		marginLeft: 300
 	}, {
 		duration: 500,
 		queue: false,
 		complete: function() {
-			assert.strictEqual( step++, 2, "Step 2" );
+			strictEqual( step++, 2, "Step 2" );
 		}
-	} ).animate( {
+	}).animate({
 		top: 100
 	}, {
 		duration: 1000,
 		queue: false,
 		complete: function() {
-			assert.strictEqual( step++, 3, "Step 3" );
+			strictEqual( step++, 3, "Step 3" );
 		}
-	} ).animate( {}, {
+	}).animate({}, {
 		duration: 2000,
 		queue: false,
 		complete: function() {
-
 			// no properties is a non-op and finishes immediately
-			assert.strictEqual( step++, 1, "Step 1" );
+			strictEqual( step++, 1, "Step 1" );
 		}
-	} ).promise().done( function() {
-		assert.strictEqual( step++, 4, "Step 4" );
-	} );
+	}).promise().done( function() {
+		strictEqual( step++, 4, "Step 4" );
+	});
 	this.clock.tick( 1000 );
-} );
-
-QUnit.test( "animate does not change start value for non-px animation (#7109)", function( assert ) {
-	assert.expect( 1 );
+});
 
-	var parent = jQuery( "<div><div></div></div>" ).css( { width: 284, height: 1 } ).appendTo( "#qunit-fixture" ),
-		child = parent.children().css( { fontSize: "98.6in", width: "0.01em", height: 1 } ),
+test( "animate does not change start value for non-px animation (#7109)", 1, function() {
+	var parent = jQuery( "<div><div></div></div>" ).css({ width: 284, height: 1 }).appendTo( "#qunit-fixture" ),
+		child = parent.children().css({ fontSize: "98.6in", width: "0.01em", height: 1 }),
 		actual = parseFloat( child.css( "width" ) ),
 		computed = [];
 
-	child.animate( { width: "0%" }, {
+	child.animate({ width: "0%" }, {
 		duration: 1,
 		step: function() {
 			computed.push( parseFloat( child.css( "width" ) ) );
 		}
-	} ).queue( function( next ) {
+	}).queue( function( next ) {
 		var ratio = computed[ 0 ] / actual;
-		assert.ok( ratio > 0.9 && ratio < 1.1, "Starting width was close enough" );
+		ok( ratio > 0.9 && ratio < 1.1 , "Starting width was close enough" );
 		next();
 		parent.remove();
-	} );
+	});
 	this.clock.tick( 10 );
-} );
-
-QUnit.test( "non-px animation handles non-numeric start (#11971)", function( assert ) {
-	assert.expect( 2 );
+});
 
-	var foo = jQuery( "#foo" ),
-		initial = foo.css( "backgroundPositionX" );
+test( "non-px animation handles non-numeric start (#11971)", 2, function() {
+	var foo = jQuery("#foo"),
+		initial = foo.css("backgroundPositionX");
 
 	if ( !initial ) {
-		assert.expect( 1 );
-		assert.ok( true, "Style property not understood" );
+		expect(1);
+		ok( true, "Style property not understood" );
 		return;
 	}
 
-	foo.animate( { backgroundPositionX: "42%" }, {
+	foo.animate({ backgroundPositionX: "42%" }, {
 		duration: 1,
 		progress: function( anim, percent ) {
 			if ( percent ) {
@@ -1837,17 +1772,17 @@ QUnit.test( "non-px animation handles non-numeric start (#11971)", function( ass
 			}
 
 			if ( parseFloat( initial ) ) {
-				assert.equal( jQuery.style( this, "backgroundPositionX" ), initial, "Numeric start preserved" );
+				equal( jQuery.style( this, "backgroundPositionX" ), initial, "Numeric start preserved" );
 			} else {
-				assert.equal( jQuery.style( this, "backgroundPositionX" ), "0%", "Non-numeric start zeroed" );
+				equal( jQuery.style( this, "backgroundPositionX" ), "0%", "Non-numeric start zeroed" );
 			}
 		},
 		done: function() {
-			assert.equal( jQuery.style( this, "backgroundPositionX" ), "42%", "End reached" );
+			equal( jQuery.style( this, "backgroundPositionX" ), "42%", "End reached" );
 		}
-	} );
+	});
 	this.clock.tick( 10 );
-} );
+});
 
 QUnit.test( "Animation callbacks (#11797)", function( assert ) {
 	assert.expect( 16 );
@@ -1936,77 +1871,36 @@ QUnit.test( "Animation callbacks (#11797)", function( assert ) {
 	this.clock.tick( 10 );
 } );
 
-QUnit.test( "Animation callbacks in order (#2292)", function( assert ) {
-	assert.expect( 9 );
-
-	var step = 0,
-		dur = 50;
-
-	// assert? -> github.com/JamesMGreene/qunit-assert-step
-	jQuery( "#foo" ).animate( {
-		width: "5px"
-	}, {
-		duration: dur,
-		start: function() {
-			assert.step( 1 );
-		},
-		progress: function( anim, p, ms ) {
-			if ( !( step++ ) ) {
-				assert.step( 2 );
-				assert.strictEqual( p, 0, "first progress callback: progress ratio" );
-				assert.strictEqual( ms, dur, "first progress callback: remaining ms" );
-			} else {
-				assert.step( 3 );
-				assert.strictEqual( p, 1, "last progress callback: progress ratio" );
-				assert.strictEqual( ms, 0, "last progress callback: remaining ms" );
-			}
-		},
-		done: function() {
-			assert.step( 4 );
-		},
-		fail: function() {
-			assert.ok( false, "Animation failed" );
-		},
-		always: function() {
-			assert.step( 5 );
-		}
-	} ).finish();
-
-	this.clock.tick( dur + 10 );
-} );
-
-QUnit.test( "Animate properly sets overflow hidden when animating width/height (#12117)", function( assert ) {
-	assert.expect( 8 );
-
+test( "Animate properly sets overflow hidden when animating width/height (#12117)", 8, function() {
 	jQuery.each( [ "height", "width" ], function( _, prop ) {
 		jQuery.each( [ 100, 0 ], function( _, value ) {
-			var div = jQuery( "<div>" ).css( "overflow", "auto" ),
+			var div = jQuery("<div>").css( "overflow", "auto" ),
 				props = {};
 			props[ prop ] = value;
 			div.animate( props, 1 );
-			assert.equal( div.css( "overflow" ), "hidden",
+			equal( div.css( "overflow" ), "hidden",
 				"overflow: hidden set when animating " + prop + " to " + value );
 			div.stop();
-			assert.equal( div.css( "overflow" ), "auto",
+			equal( div.css( "overflow" ), "auto",
 				"overflow: auto restored after animating " + prop + " to " + value );
-		} );
-	} );
-} );
+		});
+	});
+});
 
-QUnit.test( "Each tick of the timer loop uses a fresh time (#12837)", function( assert ) {
+test( "Each tick of the timer loop uses a fresh time (#12837)", function() {
 	var lastVal,
-		tmp = jQuery( {
+		tmp = jQuery({
 			test: 0
-		} );
-	assert.expect( 3 );
-	tmp.animate( {
+		});
+	expect( 3 );
+	tmp.animate({
 		test: 100
 	}, {
 		step: function( p, fx ) {
-			assert.ok( fx.now !== lastVal, "Current value is not the last value: " + lastVal + " - " + fx.now );
+			ok( fx.now !== lastVal, "Current value is not the last value: " + lastVal + " - " + fx.now );
 			lastVal = fx.now;
 		}
-	} );
+	});
 	this.clock.tick( 1 );
 
 	// now that we have a new time, run another tick
@@ -2016,151 +1910,143 @@ QUnit.test( "Each tick of the timer loop uses a fresh time (#12837)", function(
 
 	jQuery.fx.tick();
 	tmp.stop();
-} );
-
-QUnit.test( "Animations with 0 duration don't ease (#12273)", function( assert ) {
-	assert.expect( 1 );
+});
 
+test( "Animations with 0 duration don't ease (#12273)", 1, function() {
 	jQuery.easing.test = function() {
-		assert.ok( false, "Called easing" );
+		ok( false, "Called easing" );
 	};
 
-	jQuery( "#foo" ).animate( {
+	jQuery( "#foo" ).animate({
 		height: 100
 	}, {
 		duration: 0,
 		easing: "test",
 		complete: function() {
-			assert.equal( jQuery( this ).height(), 100, "Height is 100" );
+			equal( jQuery( this ).height(), 100, "Height is 100" );
 		}
-	} );
+	});
 
 	delete jQuery.easing.test;
-} );
-
-jQuery.map( [ "toggle", "slideToggle", "fadeToggle" ], function( method ) {
+});
 
+jQuery.map([ "toggle", "slideToggle", "fadeToggle" ], function ( method ) {
 	// this test would look a lot better if we were using something to override
 	// the default timers
 	var duration = 1500;
-	QUnit.test( "toggle state tests: " + method + " (#8685)", function( assert ) {
+	test( "toggle state tests: " + method + " (#8685)", function() {
 		function secondToggle() {
 			var stopped = parseFloat( element.css( check ) );
 			tested = false;
-			element[ method ]( {
+			element[ method ]({
 				duration: duration,
 				step: function( p, fx ) {
 					if ( fx.pos > 0.1 && fx.prop === check && !tested ) {
 						tested = true;
-						assert.equal( fx.start, stopped, check + " starts at " + stopped + " where it stopped" );
-						assert.equal( fx.end, original, check + " ending value is " + original );
+						equal( fx.start, stopped, check + " starts at " + stopped + " where it stopped" );
+						equal( fx.end, original, check + " ending value is " + original );
 						element.stop();
 					}
 				}
-			} );
+			});
 		}
 
 		var tested,
 			original,
 			check = method === "slideToggle" ? "height" : "opacity",
-			element = jQuery( "#foo" ).height( 200 );
+			element = jQuery("#foo").height( 200 );
 
-		assert.expect( 4 );
+		expect( 4 );
 
-		element[ method ]( {
+		element[ method ]({
 			duration: duration,
 			easing: "linear",
 			step: function( p, fx ) {
 				if ( fx.pos > 0.1 && fx.prop === check && !tested ) {
 					tested = true;
 					original = fx.start;
-					assert.ok( fx.start !== 0, check + " is starting at " + original + " on first toggle (non-zero)" );
-					assert.equal( fx.end, 0, check + " is ending at 0 on first toggle" );
+					ok( fx.start !== 0, check + " is starting at " + original + " on first toggle (non-zero)" );
+					equal( fx.end, 0, check + " is ending at 0 on first toggle" );
 					element.stop();
 				}
 			},
 			always: secondToggle
-		} );
-
+		});
                 //FIXME figure out why 470
 		this.clock.tick( 470 );
-	} );
-} );
+	});
+});
 
-QUnit.test( "jQuery.fx.start & jQuery.fx.stop hook points", function( assert ) {
+test( "jQuery.fx.start & jQuery.fx.stop hook points", function() {
 	var oldStart = jQuery.fx.start,
 		oldStop = jQuery.fx.stop,
-		foo = jQuery( { foo: 0 } );
+		foo = jQuery({ foo: 0 });
 
-	assert.expect( 3 );
+	expect( 3 );
 
 	jQuery.fx.start = function() {
-		assert.ok( true, "start called" );
+		ok( true, "start called" );
 	};
 	jQuery.fx.stop = function() {
-		assert.ok( true, "stop called" );
+		ok( true, "stop called" );
 	};
 
 	// calls start
-	foo.animate( { foo: 1 }, { queue: false } );
-
+	foo.animate({ foo: 1 }, { queue: false });
 	// calls start
-	foo.animate( { foo: 2 }, { queue: false } );
+	foo.animate({ foo: 2 }, { queue: false });
 	foo.stop();
-
 	// calls stop
 	jQuery.fx.tick();
 
 	// cleanup
 	jQuery.fx.start = oldStart;
 	jQuery.fx.stop = oldStop;
-} );
+});
 
-QUnit.test( ".finish() completes all queued animations", function( assert ) {
+test( ".finish() completes all queued animations", function() {
 	var animations = {
 			top: 100,
 			left: 100,
 			height: 100,
 			width: 100
 		},
-		div = jQuery( "<div>" );
+		div = jQuery("<div>");
 
-	assert.expect( 11 );
+	expect( 11 );
 
 	jQuery.each( animations, function( prop, value ) {
 		var anim = {};
 		anim[ prop ] = value;
-
 		// the delay shouldn't matter at all!
 		div.css( prop, 1 ).animate( anim, function() {
-			assert.ok( true, "Called animation callback for " + prop );
-		} ).delay( 100 );
-	} );
-	assert.equal( div.queue().length, 8, "8 animations in the queue" );
+			ok( true, "Called animation callback for " + prop );
+		}).delay( 100 );
+	});
+	equal( div.queue().length, 8, "8 animations in the queue" );
 	div.finish();
 	jQuery.each( animations, function( prop, value ) {
-		assert.equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" );
-	} );
-	assert.equal( div.queue().length, 0, "empty queue when done" );
-	assert.equal( div.is( ":animated" ), false, ":animated doesn't match" );
+		equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" );
+	});
+	equal( div.queue().length, 0, "empty queue when done" );
+	equal( div.is(":animated"), false, ":animated doesn't match" );
 
 	// cleanup
 	div.remove();
-
 	// leaves a "shadow timer" which does nothing around, need to force a tick
 	jQuery.fx.tick();
-} );
+});
 
-QUnit.test( ".finish( false ) - unqueued animations", function( assert ) {
+test( ".finish( false ) - unqueued animations", function() {
 	var animations = {
 			top: 100,
 			left: 100,
 			height: 100,
 			width: 100
 		},
-		div = jQuery( "<div>" );
+		div = jQuery("<div>");
 
-	assert.expect( 10 );
+	expect( 10 );
 
 	jQuery.each( animations, function( prop, value ) {
 		var anim = {};
@@ -2168,34 +2054,33 @@ QUnit.test( ".finish( false ) - unqueued animations", function( assert ) {
 		div.css( prop, 1 ).animate( anim, {
 			queue: false,
 			complete: function() {
-				assert.ok( true, "Called animation callback for " + prop );
+				ok( true, "Called animation callback for " + prop );
 			}
-		} );
-	} );
-	assert.equal( div.queue().length, 0, "0 animations in the queue" );
+		});
+	});
+	equal( div.queue().length, 0, "0 animations in the queue" );
 	div.finish( false );
 	jQuery.each( animations, function( prop, value ) {
-		assert.equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" );
-	} );
-	assert.equal( div.is( ":animated" ), false, ":animated doesn't match" );
+		equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" );
+	});
+	equal( div.is(":animated"), false, ":animated doesn't match" );
 
 	// cleanup
 	div.remove();
-
 	// leaves a "shadow timer" which does nothing around, need to force a tick
 	jQuery.fx.tick();
-} );
+});
 
-QUnit.test( ".finish( \"custom\" ) - custom queue animations", function( assert ) {
+test( ".finish( \"custom\" ) - custom queue animations", function() {
 	var animations = {
 			top: 100,
 			left: 100,
 			height: 100,
 			width: 100
 		},
-		div = jQuery( "<div>" );
+		div = jQuery("<div>");
 
-	assert.expect( 11 );
+	expect( 11 );
 
 	jQuery.each( animations, function( prop, value ) {
 		var anim = {};
@@ -2203,76 +2088,72 @@ QUnit.test( ".finish( \"custom\" ) - custom queue animations", function( assert
 		div.css( prop, 1 ).animate( anim, {
 			queue: "custom",
 			complete: function() {
-				assert.ok( true, "Called animation callback for " + prop );
+				ok( true, "Called animation callback for " + prop );
 			}
-		} );
-	} );
-	assert.equal( div.queue( "custom" ).length, 4, "4 animations in the queue" );
-
+		});
+	});
+	equal( div.queue( "custom" ).length, 4, "4 animations in the queue" );
 	// start the first animation
 	div.dequeue( "custom" );
-	assert.equal( div.is( ":animated" ), true, ":animated matches" );
+	equal( div.is(":animated"), true, ":animated matches" );
 	div.finish( "custom" );
 	jQuery.each( animations, function( prop, value ) {
-		assert.equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" );
-	} );
-	assert.equal( div.is( ":animated" ), false, ":animated doesn't match" );
+		equal( parseFloat( div.css( prop ) ), value, prop + " finished at correct value" );
+	});
+	equal( div.is(":animated"), false, ":animated doesn't match" );
 
 	// cleanup
 	div.remove();
-
 	// leaves a "shadow timer" which does nothing around, need to force a tick
 	jQuery.fx.tick();
-} );
+});
 
-QUnit.test( ".finish() calls finish of custom queue functions", function( assert ) {
+test( ".finish() calls finish of custom queue functions", function() {
 	function queueTester( next, hooks ) {
 		hooks.stop = function( gotoEnd ) {
 			inside++;
-			assert.equal( this, div[ 0 ] );
-			assert.ok( gotoEnd, "hooks.stop(true) called" );
+			equal( this, div[0] );
+			ok( gotoEnd, "hooks.stop(true) called");
 		};
 	}
 	var div = jQuery( "<div>" ),
 		inside = 0,
 		outside = 0;
 
-	assert.expect( 6 );
+	expect( 6 );
 	queueTester.finish = function() {
 		outside++;
-		assert.ok( true, "Finish called on custom queue function" );
+		ok( true, "Finish called on custom queue function" );
 	};
 
 	div.queue( queueTester ).queue( queueTester ).queue( queueTester ).finish();
 
-	assert.equal( inside, 1, "1 stop(true) callback" );
-	assert.equal( outside, 2, "2 finish callbacks" );
+	equal( inside, 1, "1 stop(true) callback" );
+	equal( outside, 2, "2 finish callbacks" );
 
 	div.remove();
-} );
+});
 
-QUnit.test( ".finish() is applied correctly when multiple elements were animated (#13937)", function( assert ) {
-	assert.expect( 3 );
+test( ".finish() is applied correctly when multiple elements were animated (#13937)", function() {
+	expect( 3 );
 
-	var elems = jQuery( "<a>0</a><a>1</a><a>2</a>" );
+	var elems = jQuery("<a>0</a><a>1</a><a>2</a>");
 
 	elems.animate( { opacity: 0 }, 1500 ).animate( { opacity: 1 }, 1500 );
-	setTimeout( function() {
+	setTimeout(function() {
 		elems.eq( 1 ).finish();
-		assert.ok( !elems.eq( 1 ).queue().length, "empty queue for .finish()ed element" );
-		assert.ok( elems.eq( 0 ).queue().length, "non-empty queue for preceding element" );
-		assert.ok( elems.eq( 2 ).queue().length, "non-empty queue for following element" );
+		ok( !elems.eq( 1 ).queue().length, "empty queue for .finish()ed element" );
+		ok( elems.eq( 0 ).queue().length, "non-empty queue for preceding element" );
+		ok( elems.eq( 2 ).queue().length, "non-empty queue for following element" );
 		elems.stop( true );
 
 	}, 100 );
 	this.clock.tick( 1500 );
-} );
-
-QUnit.test( "slideDown() after stop() (#13483)", function( assert ) {
-		assert.expect( 2 );
+});
 
+test( "slideDown() after stop() (#13483)", 2, function() {
 		var ul = jQuery( "<ul style='height: 100px; display: block;'></ul>" )
-				.appendTo( "#qunit-fixture" ),
+				.appendTo("#qunit-fixture"),
 			origHeight = ul.height(),
 			clock = this.clock;
 
@@ -2281,7 +2162,7 @@ QUnit.test( "slideDown() after stop() (#13483)", function( assert ) {
 		clock.tick( 500 );
 		ul.stop( true );
 		ul.slideDown( 1, function() {
-				assert.equal( ul.height(), origHeight, "slideDown() after interrupting slideUp() with stop(). Height must be in original value" );
+				equal( ul.height(), origHeight, "slideDown() after interrupting slideUp() with stop(). Height must be in original value" );
 
 				// Second test. slideDown() -> stop() in the middle -> slideDown() until the end
 				ul.slideUp( 1 );
@@ -2290,69 +2171,94 @@ QUnit.test( "slideDown() after stop() (#13483)", function( assert ) {
 				clock.tick( 500 );
 				ul.stop( true );
 				ul.slideDown( 1 );
-				assert.equal( ul.height(), origHeight, "slideDown() after interrupting slideDown() with stop(). Height must be in original value" );
+				equal( ul.height(), origHeight, "slideDown() after interrupting slideDown() with stop(). Height must be in original value" );
 
 				// Cleanup
 				ul.remove();
 				clock.tick( 10 );
 
-		} );
+		});
 
 		clock.tick( 10 );
-} );
-
-QUnit.test( "Respect display value on inline elements (#14824)", function( assert ) {
-	assert.expect( 2 );
+});
 
+test( "Respect display value on inline elements (#14824)", 2, function() {
 	var clock = this.clock,
 		fromStyleSheet = jQuery( "<span id='span-14824' />" ),
 		fromStyleAttr = jQuery( "<span style='display: block;' />" );
 
 	jQuery( "#qunit-fixture" ).append( fromStyleSheet, fromStyleAttr );
 
-	fromStyleSheet.slideUp( function() {
+	fromStyleSheet.slideUp(function() {
 		jQuery( this ).slideDown( function() {
-			assert.equal( jQuery( this ).css( "display" ), "block",
+			equal( jQuery( this ).css( "display" ), "block",
 				"Respect previous display value (from stylesheet) on span element" );
-		} );
-	} );
+		});
+	});
 
 	fromStyleAttr.slideUp( function() {
 		jQuery( this ).slideDown( function() {
-			assert.equal( jQuery( this ).css( "display" ), "block",
+			equal( jQuery( this ).css( "display" ), "block",
 				"Respect previous display value (from style attribute) on span element" );
-		} );
-	} );
+		});
+	});
 
 	clock.tick( 800 );
-} );
+});
+
+test( "Animation should go to its end state if document.hidden = true", 1, function() {
+	var height;
+	if ( Object.defineProperty ) {
+
+		// Can't rewrite document.hidden property if its host property
+		try {
+			Object.defineProperty( document, "hidden", {
+				get: function() {
+					return true;
+				}
+			});
+		} catch ( e ) {}
+	} else {
+		document.hidden = true;
+	}
 
-QUnit.test( "jQuery.easing._default (gh-2218)", function( assert ) {
-	assert.expect( 2 );
+	if ( document.hidden ) {
+		height = jQuery( "#qunit-fixture" ).animate({ height: 500 } ).height();
+
+		equal( height, 500, "Animation should happen immediately if document.hidden = true" );
+		jQuery( document ).removeProp( "hidden" );
+
+	} else {
+		ok( true, "Can't run the test since we can't reproduce correct environment for it" );
+	}
+});
+
+test( "jQuery.easing._default (gh-2218)", function() {
+	expect( 2 );
 
 	jQuery( "#foo" )
 		.animate( { width: "5px" }, {
 			duration: 5,
 			start: function( anim ) {
-				assert.equal( anim.opts.easing, jQuery.easing._default,
+				equal( anim.opts.easing, jQuery.easing._default,
 					"anim.opts.easing should be equal to jQuery.easing._default when the easing argument is not given" );
 			}
-		} )
+		})
 		.animate( { height: "5px" }, {
 			duration: 5,
 			easing: "linear",
 			start: function( anim ) {
-				assert.equal( anim.opts.easing, "linear",
+				equal( anim.opts.easing, "linear",
 					"anim.opts.easing should be equal to the easing argument" );
 			}
-		} )
+		})
 		.stop();
 
 	this.clock.tick( 25 );
-} );
+});
 
-QUnit.test( "jQuery.easing._default in Animation (gh-2218", function( assert ) {
-	assert.expect( 3 );
+test( "jQuery.easing._default in Animation (gh-2218", function() {
+	expect( 3 );
 
 	var animation,
 		defaultEasing = jQuery.easing._default,
@@ -2368,19 +2274,19 @@ QUnit.test( "jQuery.easing._default in Animation (gh-2218", function( assert ) {
 
 	animation = jQuery.Animation( testObject, testDest, { "duration": 1 } );
 	animation.done( function() {
-		assert.equal( testObject.width, testDest.width, "Animated width" );
-		assert.ok( called, "Custom jQuery.easing._default called" );
-		assert.strictEqual( animation.opts.easing, "custom",
+		equal( testObject.width, testDest.width, "Animated width" );
+		ok( called, "Custom jQuery.easing._default called" );
+		strictEqual( animation.opts.easing, "custom",
 			"Animation used custom jQuery.easing._default" );
 		jQuery.easing._default = defaultEasing;
 		delete jQuery.easing.custom;
-	} );
+	});
 
 	this.clock.tick( 10 );
-} );
+});
 
-QUnit.test( "jQuery.easing._default in Tween (gh-2218)", function( assert ) {
-	assert.expect( 3 );
+test( "jQuery.easing._default in Tween (gh-2218)", function() {
+	expect( 3 );
 
 	var tween,
 		defaultEasing = jQuery.easing._default,
@@ -2395,100 +2301,12 @@ QUnit.test( "jQuery.easing._default in Tween (gh-2218)", function( assert ) {
 
 	tween = jQuery.Tween( testObject, { "duration": 1 }, "width", 200 );
 	tween.run( 1 );
-	assert.equal( testObject.width, 200, "Animated width" );
-	assert.ok( called, "Custom jQuery.easing._default called" );
-	assert.strictEqual( tween.easing, "custom",
+	equal( testObject.width, 200, "Animated width" );
+	ok( called, "Custom jQuery.easing._default called" );
+	strictEqual( tween.easing, "custom",
 		"Animation used custom jQuery.easing._default" );
 	jQuery.easing._default = defaultEasing;
 	delete jQuery.easing.custom;
-} );
-
-QUnit.test( "Display value is correct for disconnected nodes (trac-13310)", function( assert ) {
-	assert.expect( 3 );
-
-	var div = jQuery( "<div/>" );
-
-	assert.equal( div.css( "display", "inline" ).hide().show().appendTo( "body" ).css( "display" ), "inline", "Initialized display value has returned" );
-	div.remove();
-
-	div.css( "display", "none" ).hide();
-	assert.equal( jQuery._data( div[ 0 ], "display" ), undefined, "display data is undefined after hiding a detached and hidden element" );
-	div.remove();
-
-	div.css( "display", "inline-block" ).hide().appendTo( "body" ).fadeIn( function() {
-		assert.equal( div.css( "display" ), "inline-block", "Initialized display value has returned" );
-		div.remove();
-	} );
-	this.clock.tick( 1000 );
-} );
-
-QUnit.test( "Show/hide/toggle and display: inline", function( assert ) {
-	assert.expect( 40 );
-
-	var clock = this.clock;
-
-	jQuery( "<span/><div style='display:inline' title='inline div'/>" ).each( function() {
-		var completed, interrupted,
-			N = 100,
-			fixture = jQuery( "#qunit-fixture" ),
-			$el = jQuery( this ),
-			kind = this.title || this.nodeName.toLowerCase();
-
-		// Animations allowed to complete
-		completed = jQuery.map( [
-			$el.clone().data( { call: "hide", done: "none" } ).appendTo( fixture ).hide( N ),
-			$el.clone().data( { call: "toggle", done: "none" } ).appendTo( fixture ).toggle( N ),
-			$el.clone().data( { call: "hide+show", done: "inline" } ).appendTo( fixture )
-				.hide().show( N ),
-			$el.clone().data( { call: "hide+toggle", done: "inline" } ).appendTo( fixture )
-				.hide().toggle( N )
-		], function( $clone ) { return $clone[ 0 ]; } );
-
-		// Animations not allowed to complete
-		interrupted = jQuery.map( [
-			$el.clone().data( { call: "hide+stop" } ).appendTo( fixture ).hide( N ),
-			$el.clone().data( { call: "toggle+stop" } ).appendTo( fixture ).toggle( N ),
-			$el.clone().data( { call: "hide+show+stop" } ).appendTo( fixture ).hide().show( N ),
-			$el.clone().data( { call: "hide+toggle+stop" } ).appendTo( fixture ).hide().toggle( N )
-		], function( $clone ) { return $clone[ 0 ]; } );
-
-		// All elements should be inline-block during the animation
-		clock.tick( N / 2 );
-		jQuery( completed ).each( function() {
-			var $el = jQuery( this ),
-				call = $el.data( "call" );
-			assert.strictEqual( $el.css( "display" ), "inline-block", kind + " display during " + call );
-		} );
-
-		// Interrupted elements should remain inline-block
-		jQuery( interrupted ).stop();
-		clock.tick( N / 2 );
-		jQuery( interrupted ).each( function() {
-			var $el = jQuery( this ),
-				call = $el.data( "call" );
-			assert.strictEqual( $el.css( "display" ), "inline-block", kind + " display after " + call );
-		} );
-
-		// Completed elements should not remain inline-block
-		clock.tick( N / 2 );
-		jQuery( completed ).each( function() {
-			var $el = jQuery( this ),
-				call = $el.data( "call" ),
-				display = $el.data( "done" );
-			assert.strictEqual( $el.css( "display" ), display, kind + " display after " + call );
-		} );
-
-		// A post-animation toggle should not make any element inline-block
-		completed = jQuery( completed.concat( interrupted ) );
-		completed.toggle( N / 2 );
-		clock.tick( N );
-		completed.each( function() {
-			var $el = jQuery( this ),
-				call = $el.data( "call" );
-			assert.ok( $el.css( "display" ) !== "inline-block",
-				kind + " display is not inline-block after " + call + "+toggle" );
-		} );
-	} );
-} );
+});
 
-} )();
+})();
diff --git a/test/unit/ready.js b/test/unit/ready.js
index 079c344ea..70deff5d2 100644
--- a/test/unit/ready.js
+++ b/test/unit/ready.js
@@ -38,7 +38,7 @@ QUnit.module( "ready" );
 	noEarlyExecution = order.length === 0;
 
 	// This assumes that QUnit tests are run on DOM ready!
-	QUnit.test("jQuery ready", function( assert ) {
+	QUnit.test("jQuery ready", function() {
 		expect(10);
 
 		ok(noEarlyExecution, "Handlers bound to DOM ready should not execute before DOM ready");
-- 
2.39.5