Tests: partially use new qunit interface

http://qunitjs.com/upgrade-guide-2.x/

For most of the boring work was used
https://github.com/apsdehal/qunit-migrate package

However, it can't update local qunit helpers, plus in some places
old QUnit.asyncTest signature is still used

Fixes gh-2540

1 files changed, 180 insertions, 176 deletions

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 72327e011..5b471094f 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -4,7 +4,7 @@ if ( !jQuery.fn.width ) {
 	return;
 }
 
-module("dimensions", { teardown: moduleTeardown });
+QUnit.module("dimensions", { teardown: moduleTeardown });
 
 function pass( val ) {
 	return val;
@@ -21,127 +21,127 @@ function fn( val ) {
 	pass and fn can be used to test passing functions to setters
 	See testWidth below for an example
 
-	pass( value );
+	pass( value, assert );
 		This function returns whatever value is passed in
 
-	fn( value );
+	fn( value, assert );
 		Returns a function that returns the value
 */
 
-function testWidth( val ) {
-	expect(9);
+function testWidth( val, assert ) {
+	assert.expect(9);
 	var $div, blah;
 
 	$div = jQuery("#nothiddendiv");
 	$div.width( val(30) );
-	equal($div.width(), 30, "Test set to 30 correctly");
+	assert.equal($div.width(), 30, "Test set to 30 correctly");
 	$div.hide();
-	equal($div.width(), 30, "Test hidden div");
+	assert.equal($div.width(), 30, "Test hidden div");
 	$div.show();
 	$div.width( val(-1) ); // handle negative numbers by setting to 0 #11604
-	equal($div.width(), 0, "Test negative width normalized to 0");
+	assert.equal($div.width(), 0, "Test negative width normalized to 0");
 	$div.css("padding", "20px");
-	equal($div.width(), 0, "Test padding specified with pixels");
+	assert.equal($div.width(), 0, "Test padding specified with pixels");
 	$div.css("border", "2px solid #fff");
-	equal($div.width(), 0, "Test border specified with pixels");
+	assert.equal($div.width(), 0, "Test border specified with pixels");
 
 	$div.css({ "display": "", "border": "", "padding": "" });
 
 	jQuery("#nothiddendivchild").css({ "width": 20, "padding": "3px", "border": "2px solid #fff" });
-	equal(jQuery("#nothiddendivchild").width(), 20, "Test child width with border and padding");
+	assert.equal(jQuery("#nothiddendivchild").width(), 20, "Test child width with border and padding");
 	jQuery("#nothiddendiv, #nothiddendivchild").css({ "border": "", "padding": "", "width": "" });
 
 	blah = jQuery("blah");
-	equal( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
-	equal( blah.width(), null, "Make sure 'null' is returned on an empty set");
+	assert.equal( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
+	assert.equal( blah.width(), null, "Make sure 'null' is returned on an empty set");
 
-	equal( jQuery(window).width(), document.documentElement.clientWidth, "Window width is equal to width reported by window/document." );
+	assert.equal( jQuery(window).width(), document.documentElement.clientWidth, "Window width is equal to width reported by window/document." );
 
 	QUnit.expectJqData( this, $div[0], "olddisplay" );
 }
 
-test("width()", function() {
-	testWidth( pass );
+QUnit.test("width()", function( assert ) {
+	testWidth( pass, assert );
 });
 
-test("width(Function)", function() {
-	testWidth( fn );
+QUnit.test("width(Function)", function( assert ) {
+	testWidth( fn, assert );
 });
 
-test("width(Function(args))", function() {
-	expect( 2 );
+QUnit.test("width(Function(args))", function( assert ) {
+	assert.expect( 2 );
 
 	var $div = jQuery("#nothiddendiv");
 	$div.width( 30 ).width(function(i, width) {
-		equal( width, 30, "Make sure previous value is correct." );
+		assert.equal( width, 30, "Make sure previous value is correct." );
 		return width + 1;
 	});
 
-	equal( $div.width(), 31, "Make sure value was modified correctly." );
+	assert.equal( $div.width(), 31, "Make sure value was modified correctly." );
 });
 
-function testHeight( val ) {
-	expect(9);
+function testHeight( val, assert ) {
+	assert.expect(9);
 
 	var $div, blah;
 
 	$div = jQuery("#nothiddendiv");
 	$div.height( val(30) );
-	equal($div.height(), 30, "Test set to 30 correctly");
+	assert.equal($div.height(), 30, "Test set to 30 correctly");
 	$div.hide();
-	equal($div.height(), 30, "Test hidden div");
+	assert.equal($div.height(), 30, "Test hidden div");
 	$div.show();
 	$div.height( val(-1) ); // handle negative numbers by setting to 0 #11604
-	equal($div.height(), 0, "Test negative height normalized to 0");
+	assert.equal($div.height(), 0, "Test negative height normalized to 0");
 	$div.css("padding", "20px");
-	equal($div.height(), 0, "Test padding specified with pixels");
+	assert.equal($div.height(), 0, "Test padding specified with pixels");
 	$div.css("border", "2px solid #fff");
-	equal($div.height(), 0, "Test border specified with pixels");
+	assert.equal($div.height(), 0, "Test border specified with pixels");
 
 	$div.css({ "display": "", "border": "", "padding": "", "height": "1px" });
 
 	jQuery("#nothiddendivchild").css({ "height": 20, "padding": "3px", "border": "2px solid #fff" });
-	equal(jQuery("#nothiddendivchild").height(), 20, "Test child height with border and padding");
+	assert.equal(jQuery("#nothiddendivchild").height(), 20, "Test child height with border and padding");
 	jQuery("#nothiddendiv, #nothiddendivchild").css({ "border": "", "padding": "", "height": "" });
 
 	blah = jQuery("blah");
-	equal( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
-	equal( blah.height(), null, "Make sure 'null' is returned on an empty set");
+	assert.equal( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
+	assert.equal( blah.height(), null, "Make sure 'null' is returned on an empty set");
 
-	equal( jQuery(window).height(), document.documentElement.clientHeight, "Window width is equal to width reported by window/document." );
+	assert.equal( jQuery(window).height(), document.documentElement.clientHeight, "Window width is equal to width reported by window/document." );
 
 	QUnit.expectJqData( this, $div[0], "olddisplay" );
 }
 
-test("height()", function() {
-	testHeight( pass );
+QUnit.test("height()", function( assert ) {
+	testHeight( pass, assert );
 });
 
-test("height(Function)", function() {
-	testHeight( fn );
+QUnit.test("height(Function)", function( assert ) {
+	testHeight( fn, assert );
 });
 
-test("height(Function(args))", function() {
-	expect( 2 );
+QUnit.test("height(Function(args))", function( assert ) {
+	assert.expect( 2 );
 
 	var $div = jQuery("#nothiddendiv");
 	$div.height( 30 ).height(function(i, height) {
-		equal( height, 30, "Make sure previous value is correct." );
+		assert.equal( height, 30, "Make sure previous value is correct." );
 		return height + 1;
 	});
 
-	equal( $div.height(), 31, "Make sure value was modified correctly." );
+	assert.equal( $div.height(), 31, "Make sure value was modified correctly." );
 });
 
-test("innerWidth()", function() {
-	expect( 6 );
+QUnit.test("innerWidth()", function( assert ) {
+	assert.expect( 6 );
 
 	var $div, div,
 		$win = jQuery( window ),
 		$doc = jQuery( document );
 
-	equal( jQuery( window ).innerWidth(), $win.width(), "Test on window" );
-	equal( jQuery( document ).innerWidth(), $doc.width(), "Test on document" );
+	assert.equal( jQuery( window ).innerWidth(), $win.width(), "Test on window" );
+	assert.equal( jQuery( document ).innerWidth(), $doc.width(), "Test on document" );
 
 	$div = jQuery( "#nothiddendiv" );
 	$div.css({
@@ -150,11 +150,11 @@ test("innerWidth()", function() {
 		"width": 30
 	});
 
-	equal( $div.innerWidth(), 30, "Test with margin and border" );
+	assert.equal( $div.innerWidth(), 30, "Test with margin and border" );
 	$div.css( "padding", "20px" );
-	equal( $div.innerWidth(), 70, "Test with margin, border and padding" );
+	assert.equal( $div.innerWidth(), 70, "Test with margin, border and padding" );
 	$div.hide();
-	equal( $div.innerWidth(), 70, "Test hidden div" );
+	assert.equal( $div.innerWidth(), 70, "Test hidden div" );
 
 	// reset styles
 	$div.css({ "display": "", "border": "", "padding": "", "width": "", "height": "" });
@@ -162,21 +162,21 @@ test("innerWidth()", function() {
 	div = jQuery( "<div>" );
 
 	// Temporarily require 0 for backwards compat - should be auto
-	equal( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
+	assert.equal( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
 	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
 });
 
-test("innerHeight()", function() {
-	expect( 6 );
+QUnit.test("innerHeight()", function( assert ) {
+	assert.expect( 6 );
 
 	var $div, div,
 		$win = jQuery( window ),
 		$doc = jQuery( document );
 
-	equal( jQuery( window ).innerHeight(), $win.height(), "Test on window" );
-	equal( jQuery( document ).innerHeight(), $doc.height(), "Test on document" );
+	assert.equal( jQuery( window ).innerHeight(), $win.height(), "Test on window" );
+	assert.equal( jQuery( document ).innerHeight(), $doc.height(), "Test on document" );
 
 	$div = jQuery( "#nothiddendiv" );
 	$div.css({
@@ -185,11 +185,11 @@ test("innerHeight()", function() {
 		"height": 30
 	});
 
-	equal( $div.innerHeight(), 30, "Test with margin and border" );
+	assert.equal( $div.innerHeight(), 30, "Test with margin and border" );
 	$div.css( "padding", "20px" );
-	equal( $div.innerHeight(), 70, "Test with margin, border and padding" );
+	assert.equal( $div.innerHeight(), 70, "Test with margin, border and padding" );
 	$div.hide();
-	equal( $div.innerHeight(), 70, "Test hidden div" );
+	assert.equal( $div.innerHeight(), 70, "Test hidden div" );
 
 	// reset styles
 	$div.css({ "display": "", "border": "", "padding": "", "width": "", "height": "" });
@@ -197,38 +197,38 @@ test("innerHeight()", function() {
 	div = jQuery( "<div>" );
 
 	// Temporarily require 0 for backwards compat - should be auto
-	equal( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
+	assert.equal( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
 	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
 });
 
-test("outerWidth()", function() {
-	expect( 11 );
+QUnit.test("outerWidth()", function( assert ) {
+	assert.expect( 11 );
 
 	var $div, div,
 		$win = jQuery( window ),
 		$doc = jQuery( document );
 
-	equal( jQuery( window ).outerWidth(), $win.width(), "Test on window without margin option" );
-	equal( jQuery( window ).outerWidth( true ), $win.width(), "Test on window with margin option" );
-	equal( jQuery( document ).outerWidth(), $doc.width(), "Test on document without margin option" );
-	equal( jQuery( document ).outerWidth( true ), $doc.width(), "Test on document with margin option" );
+	assert.equal( jQuery( window ).outerWidth(), $win.width(), "Test on window without margin option" );
+	assert.equal( jQuery( window ).outerWidth( true ), $win.width(), "Test on window with margin option" );
+	assert.equal( jQuery( document ).outerWidth(), $doc.width(), "Test on document without margin option" );
+	assert.equal( jQuery( document ).outerWidth( true ), $doc.width(), "Test on document with margin option" );
 
 	$div = jQuery( "#nothiddendiv" );
 	$div.css( "width", 30 );
 
-	equal( $div.outerWidth(), 30, "Test with only width set" );
+	assert.equal( $div.outerWidth(), 30, "Test with only width set" );
 	$div.css( "padding", "20px" );
-	equal( $div.outerWidth(), 70, "Test with padding" );
+	assert.equal( $div.outerWidth(), 70, "Test with padding" );
 	$div.css( "border", "2px solid #fff" );
-	equal( $div.outerWidth(), 74, "Test with padding and border" );
+	assert.equal( $div.outerWidth(), 74, "Test with padding and border" );
 	$div.css( "margin", "10px" );
-	equal( $div.outerWidth(), 74, "Test with padding, border and margin without margin option" );
+	assert.equal( $div.outerWidth(), 74, "Test with padding, border and margin without margin option" );
 	$div.css( "position", "absolute" );
-	equal( $div.outerWidth( true ), 94, "Test with padding, border and margin with margin option" );
+	assert.equal( $div.outerWidth( true ), 94, "Test with padding, border and margin with margin option" );
 	$div.hide();
-	equal( $div.outerWidth( true ), 94, "Test hidden div with padding, border and margin with margin option" );
+	assert.equal( $div.outerWidth( true ), 94, "Test hidden div with padding, border and margin with margin option" );
 
 	// reset styles
 	$div.css({ "position": "", "display": "", "border": "", "padding": "", "width": "", "height": "" });
@@ -236,14 +236,14 @@ test("outerWidth()", function() {
 	div = jQuery( "<div>" );
 
 	// Temporarily require 0 for backwards compat - should be auto
-	equal( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
+	assert.equal( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
 	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
 });
 
-test("child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height()  see #9441 #9300", function() {
-	expect(16);
+QUnit.test("child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height()  see #9441 #9300", function( assert ) {
+	assert.expect(16);
 
 	// setup html
 	var $divNormal = jQuery("<div>").css({ "width": "100px", "height": "100px", "border": "10px solid white", "padding": "2px", "margin": "3px" }),
@@ -253,38 +253,38 @@ test("child of a hidden elem (or unconnected node) has accurate inner/outer/Widt
 	$divNormal.appendTo("body");
 
 	// tests that child div of a hidden div works the same as a normal div
-	equal( $divChild.width(), $divNormal.width(), "child of a hidden element width() is wrong see #9441" );
-	equal( $divChild.innerWidth(), $divNormal.innerWidth(), "child of a hidden element innerWidth() is wrong see #9441" );
-	equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #9441" );
-	equal( $divChild.outerWidth(true), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #9300" );
+	assert.equal( $divChild.width(), $divNormal.width(), "child of a hidden element width() is wrong see #9441" );
+	assert.equal( $divChild.innerWidth(), $divNormal.innerWidth(), "child of a hidden element innerWidth() is wrong see #9441" );
+	assert.equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #9441" );
+	assert.equal( $divChild.outerWidth(true), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #9300" );
 
 	// Support: IE 10-11, Edge
 	// Child height is not always decimal
-	equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #9441" );
-	equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #9441" );
-	equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #9441" );
-	equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #9300" );
+	assert.equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #9441" );
+	assert.equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #9441" );
+	assert.equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #9441" );
+	assert.equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #9300" );
 
 	// tests that child div of an unconnected div works the same as a normal div
-	equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #9441" );
-	equal( $divUnconnected.innerWidth(), $divNormal.innerWidth(), "unconnected element innerWidth() is wrong see #9441" );
-	equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #9441" );
-	equal( $divUnconnected.outerWidth(true), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #9300" );
+	assert.equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #9441" );
+	assert.equal( $divUnconnected.innerWidth(), $divNormal.innerWidth(), "unconnected element innerWidth() is wrong see #9441" );
+	assert.equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #9441" );
+	assert.equal( $divUnconnected.outerWidth(true), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #9300" );
 
 	// Support: IE 10-11, Edge
 	// Child height is not always decimal
-	equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #9441" );
-	equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #9441" );
-	equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #9441" );
-	equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #9300" );
+	assert.equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #9441" );
+	assert.equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #9441" );
+	assert.equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #9441" );
+	assert.equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #9300" );
 
 	// teardown html
 	$divHiddenParent.remove();
 	$divNormal.remove();
 });
 
-test("getting dimensions shouldn't modify runtimeStyle see #9233", function() {
-	expect( 1 );
+QUnit.test("getting dimensions shouldn't modify runtimeStyle see #9233", function( assert ) {
+	assert.expect( 1 );
 
 	var $div = jQuery( "<div>" ).appendTo( "#qunit-fixture" ),
 		div = $div.get( 0 ),
@@ -298,16 +298,16 @@ test("getting dimensions shouldn't modify runtimeStyle see #9233", function() {
 	$div.outerWidth( true );
 
 	if ( runtimeStyle ) {
-		equal( div.runtimeStyle.left, "11em", "getting dimensions modifies runtimeStyle, see #9233" );
+		assert.equal( div.runtimeStyle.left, "11em", "getting dimensions modifies runtimeStyle, see #9233" );
 	} else {
-		ok( true, "this browser doesn't support runtimeStyle, see #9233" );
+		assert.ok( true, "this browser doesn't support runtimeStyle, see #9233" );
 	}
 
 	$div.remove();
 });
 
-test( "table dimensions", function() {
-	expect( 2 );
+QUnit.test( "table dimensions", function( assert ) {
+	assert.expect( 2 );
 
 	var table = jQuery("<table><colgroup><col/><col/></colgroup><tbody><tr><td></td><td>a</td></tr><tr><td></td><td>a</td></tr></tbody></table>").appendTo("#qunit-fixture"),
 		tdElem = table.find("td").first(),
@@ -315,12 +315,12 @@ test( "table dimensions", function() {
 
 	table.find("td").css({ "margin": 0, "padding": 0 });
 
-	equal( tdElem.width(), tdElem.width(), "width() doesn't alter dimension values of empty cells, see #11293" );
-	equal( colElem.width(), 300, "col elements have width(), see #12243" );
+	assert.equal( tdElem.width(), tdElem.width(), "width() doesn't alter dimension values of empty cells, see #11293" );
+	assert.equal( colElem.width(), 300, "col elements have width(), see #12243" );
 });
 
-test("box-sizing:border-box child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height()  see #10413", function() {
-	expect(16);
+QUnit.test("box-sizing:border-box child of a hidden elem (or unconnected node) has accurate inner/outer/Width()/Height()  see #10413", function( assert ) {
+	assert.expect(16);
 
 	// setup html
 	var $divNormal = jQuery("<div>").css({ "boxSizing": "border-box", "width": "100px", "height": "100px", "border": "10px solid white", "padding": "2px", "margin": "3px" }),
@@ -330,61 +330,61 @@ test("box-sizing:border-box child of a hidden elem (or unconnected node) has acc
 	$divNormal.appendTo("body");
 
 	// tests that child div of a hidden div works the same as a normal div
-	equal( $divChild.width(), $divNormal.width(), "child of a hidden element width() is wrong see #10413" );
-	equal( $divChild.innerWidth(), $divNormal.innerWidth(), "child of a hidden element innerWidth() is wrong see #10413" );
-	equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #10413" );
-	equal( $divChild.outerWidth(true), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #10413" );
+	assert.equal( $divChild.width(), $divNormal.width(), "child of a hidden element width() is wrong see #10413" );
+	assert.equal( $divChild.innerWidth(), $divNormal.innerWidth(), "child of a hidden element innerWidth() is wrong see #10413" );
+	assert.equal( $divChild.outerWidth(), $divNormal.outerWidth(), "child of a hidden element outerWidth() is wrong see #10413" );
+	assert.equal( $divChild.outerWidth(true), $divNormal.outerWidth( true ), "child of a hidden element outerWidth( true ) is wrong see #10413" );
 
 	// Support: IE 10-11, Edge
 	// Child height is not always decimal
-	equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #10413" );
-	equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #10413" );
-	equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #10413" );
-	equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #10413" );
+	assert.equal( $divChild.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "child of a hidden element height() is wrong see #10413" );
+	assert.equal( $divChild.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "child of a hidden element innerHeight() is wrong see #10413" );
+	assert.equal( $divChild.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "child of a hidden element outerHeight() is wrong see #10413" );
+	assert.equal( $divChild.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "child of a hidden element outerHeight( true ) is wrong see #10413" );
 
 	// tests that child div of an unconnected div works the same as a normal div
-	equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #10413" );
-	equal( $divUnconnected.innerWidth(), $divNormal.innerWidth(), "unconnected element innerWidth() is wrong see #10413" );
-	equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #10413" );
-	equal( $divUnconnected.outerWidth(true), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #10413" );
+	assert.equal( $divUnconnected.width(), $divNormal.width(), "unconnected element width() is wrong see #10413" );
+	assert.equal( $divUnconnected.innerWidth(), $divNormal.innerWidth(), "unconnected element innerWidth() is wrong see #10413" );
+	assert.equal( $divUnconnected.outerWidth(), $divNormal.outerWidth(), "unconnected element outerWidth() is wrong see #10413" );
+	assert.equal( $divUnconnected.outerWidth(true), $divNormal.outerWidth( true ), "unconnected element outerWidth( true ) is wrong see #10413" );
 
 	// Support: IE 10-11, Edge
 	// Child height is not always decimal
-	equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #10413" );
-	equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #10413" );
-	equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #10413" );
-	equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #10413" );
+	assert.equal( $divUnconnected.height().toFixed( 3 ), $divNormal.height().toFixed( 3 ), "unconnected element height() is wrong see #10413" );
+	assert.equal( $divUnconnected.innerHeight().toFixed( 3 ), $divNormal.innerHeight().toFixed( 3 ), "unconnected element innerHeight() is wrong see #10413" );
+	assert.equal( $divUnconnected.outerHeight().toFixed( 3 ), $divNormal.outerHeight().toFixed( 3 ), "unconnected element outerHeight() is wrong see #10413" );
+	assert.equal( $divUnconnected.outerHeight( true ).toFixed( 3 ), $divNormal.outerHeight( true ).toFixed( 3 ), "unconnected element outerHeight( true ) is wrong see #10413" );
 
 	// teardown html
 	$divHiddenParent.remove();
 	$divNormal.remove();
 });
 
-test("outerHeight()", function() {
-	expect( 11 );
+QUnit.test("outerHeight()", function( assert ) {
+	assert.expect( 11 );
 
 	var $div, div,
 		$win = jQuery( window ),
 		$doc = jQuery( document );
 
-	equal( jQuery( window ).outerHeight(), $win.height(), "Test on window without margin option" );
-	equal( jQuery( window ).outerHeight( true ), $win.height(), "Test on window with margin option" );
-	equal( jQuery( document ).outerHeight(), $doc.height(), "Test on document without margin option" );
-	equal( jQuery( document ).outerHeight( true ), $doc.height(), "Test on document with margin option" );
+	assert.equal( jQuery( window ).outerHeight(), $win.height(), "Test on window without margin option" );
+	assert.equal( jQuery( window ).outerHeight( true ), $win.height(), "Test on window with margin option" );
+	assert.equal( jQuery( document ).outerHeight(), $doc.height(), "Test on document without margin option" );
+	assert.equal( jQuery( document ).outerHeight( true ), $doc.height(), "Test on document with margin option" );
 
 	$div = jQuery( "#nothiddendiv" );
 	$div.css( "height", 30 );
 
-	equal( $div.outerHeight(), 30, "Test with only width set" );
+	assert.equal( $div.outerHeight(), 30, "Test with only width set" );
 	$div.css( "padding", "20px" );
-	equal( $div.outerHeight(), 70, "Test with padding" );
+	assert.equal( $div.outerHeight(), 70, "Test with padding" );
 	$div.css( "border", "2px solid #fff" );
-	equal( $div.outerHeight(), 74, "Test with padding and border" );
+	assert.equal( $div.outerHeight(), 74, "Test with padding and border" );
 	$div.css( "margin", "10px" );
-	equal( $div.outerHeight(), 74, "Test with padding, border and margin without margin option" );
-	equal( $div.outerHeight( true ), 94, "Test with padding, border and margin with margin option" );
+	assert.equal( $div.outerHeight(), 74, "Test with padding, border and margin without margin option" );
+	assert.equal( $div.outerHeight( true ), 94, "Test with padding, border and margin with margin option" );
 	$div.hide();
-	equal( $div.outerHeight( true ), 94, "Test hidden div with padding, border and margin with margin option" );
+	assert.equal( $div.outerHeight( true ), 94, "Test hidden div with padding, border and margin with margin option" );
 
 	// reset styles
 	$div.css({ "display": "", "border": "", "padding": "", "width": "", "height": "" });
@@ -392,78 +392,82 @@ test("outerHeight()", function() {
 	div = jQuery( "<div>" );
 
 	// Temporarily require 0 for backwards compat - should be auto
-	equal( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
+	assert.equal( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
 
 	div.remove();
 	QUnit.expectJqData( this, $div[ 0 ], "olddisplay" );
 });
 
-test("passing undefined is a setter #5571", function() {
-	expect(4);
-	equal(jQuery("#nothiddendiv").height(30).height(undefined).height(), 30, ".height(undefined) is chainable (#5571)");
-	equal(jQuery("#nothiddendiv").height(30).innerHeight(undefined).height(), 30, ".innerHeight(undefined) is chainable (#5571)");
-	equal(jQuery("#nothiddendiv").height(30).outerHeight(undefined).height(), 30, ".outerHeight(undefined) is chainable (#5571)");
-	equal(jQuery("#nothiddendiv").width(30).width(undefined).width(), 30, ".width(undefined) is chainable (#5571)");
+QUnit.test("passing undefined is a setter #5571", function( assert ) {
+	assert.expect(4);
+	assert.equal(jQuery("#nothiddendiv").height(30).height(undefined).height(), 30, ".height(undefined) is chainable (#5571)");
+	assert.equal(jQuery("#nothiddendiv").height(30).innerHeight(undefined).height(), 30, ".innerHeight(undefined) is chainable (#5571)");
+	assert.equal(jQuery("#nothiddendiv").height(30).outerHeight(undefined).height(), 30, ".outerHeight(undefined) is chainable (#5571)");
+	assert.equal(jQuery("#nothiddendiv").width(30).width(undefined).width(), 30, ".width(undefined) is chainable (#5571)");
 });
 
-test( "getters on non elements should return null", function() {
-	expect( 8 );
+QUnit.test( "getters on non elements should return null", function( assert ) {
+	assert.expect( 8 );
 
 	var nonElem = jQuery("notAnElement");
 
-	strictEqual( nonElem.width(), null, ".width() is not null (#12283)" );
-	strictEqual( nonElem.innerWidth(), null, ".innerWidth() is not null (#12283)" );
-	strictEqual( nonElem.outerWidth(), null, ".outerWidth() is not null (#12283)" );
-	strictEqual( nonElem.outerWidth( true ), null, ".outerWidth(true) is not null (#12283)" );
+	assert.strictEqual( nonElem.width(), null, ".width() is not null (#12283)" );
+	assert.strictEqual( nonElem.innerWidth(), null, ".innerWidth() is not null (#12283)" );
+	assert.strictEqual( nonElem.outerWidth(), null, ".outerWidth() is not null (#12283)" );
+	assert.strictEqual( nonElem.outerWidth( true ), null, ".outerWidth(true) is not null (#12283)" );
 
-	strictEqual( nonElem.height(), null, ".height() is not null (#12283)" );
-	strictEqual( nonElem.innerHeight(), null, ".innerHeight() is not null (#12283)" );
-	strictEqual( nonElem.outerHeight(), null, ".outerHeight() is not null (#12283)" );
-	strictEqual( nonElem.outerHeight( true ), null, ".outerHeight(true) is not null (#12283)" );
+	assert.strictEqual( nonElem.height(), null, ".height() is not null (#12283)" );
+	assert.strictEqual( nonElem.innerHeight(), null, ".innerHeight() is not null (#12283)" );
+	assert.strictEqual( nonElem.outerHeight(), null, ".outerHeight() is not null (#12283)" );
+	assert.strictEqual( nonElem.outerHeight( true ), null, ".outerHeight(true) is not null (#12283)" );
 });
 
-test("setters with and without box-sizing:border-box", function(){
-	expect(20);
+QUnit.test("setters with and without box-sizing:border-box", function( assert ){
+	assert.expect(20);
 
 	// Support: Android 2.3 (-webkit-box-sizing).
 	var el_bb = jQuery("<div style='width:114px;height:114px;margin:5px;padding:3px;border:4px solid white;-webkit-box-sizing:border-box;box-sizing:border-box;'>test</div>").appendTo("#qunit-fixture"),
 		el = jQuery("<div style='width:100px;height:100px;margin:5px;padding:3px;border:4px solid white;'>test</div>").appendTo("#qunit-fixture"),
 		expected = 100;
 
-	equal( el_bb.width( 101 ).width(), expected + 1, "test border-box width(int) by roundtripping" );
-	equal( el_bb.innerWidth( 108 ).width(), expected + 2, "test border-box innerWidth(int) by roundtripping" );
-	equal( el_bb.outerWidth( 117 ).width(), expected + 3, "test border-box outerWidth(int) by roundtripping" );
-	equal( el_bb.outerWidth( 118, false ).width(), expected + 4, "test border-box outerWidth(int, false) by roundtripping" );
-	equal( el_bb.outerWidth( 129, true ).width(), expected + 5, "test border-box innerWidth(int, true) by roundtripping" );
-
-	equal( el_bb.height( 101 ).height(), expected + 1, "test border-box height(int) by roundtripping" );
-	equal( el_bb.innerHeight( 108 ).height(), expected + 2, "test border-box innerHeight(int) by roundtripping" );
-	equal( el_bb.outerHeight( 117 ).height(), expected + 3, "test border-box outerHeight(int) by roundtripping" );
-	equal( el_bb.outerHeight( 118, false ).height(), expected + 4, "test border-box outerHeight(int, false) by roundtripping" );
-	equal( el_bb.outerHeight( 129, true ).height(), expected + 5, "test border-box innerHeight(int, true) by roundtripping" );
-
-	equal( el.width( 101 ).width(), expected + 1, "test border-box width(int) by roundtripping" );
-	equal( el.innerWidth( 108 ).width(), expected + 2, "test border-box innerWidth(int) by roundtripping" );
-	equal( el.outerWidth( 117 ).width(), expected + 3, "test border-box outerWidth(int) by roundtripping" );
-	equal( el.outerWidth( 118, false ).width(), expected + 4, "test border-box outerWidth(int, false) by roundtripping" );
-	equal( el.outerWidth( 129, true ).width(), expected + 5, "test border-box innerWidth(int, true) by roundtripping" );
-
-	equal( el.height( 101 ).height(), expected + 1, "test border-box height(int) by roundtripping" );
-	equal( el.innerHeight( 108 ).height(), expected + 2, "test border-box innerHeight(int) by roundtripping" );
-	equal( el.outerHeight( 117 ).height(), expected + 3, "test border-box outerHeight(int) by roundtripping" );
-	equal( el.outerHeight( 118, false ).height(), expected + 4, "test border-box outerHeight(int, false) by roundtripping" );
-	equal( el.outerHeight( 129, true ).height(), expected + 5, "test border-box innerHeight(int, true) by roundtripping" );
+	assert.equal( el_bb.width( 101 ).width(), expected + 1, "test border-box width(int) by roundtripping" );
+	assert.equal( el_bb.innerWidth( 108 ).width(), expected + 2, "test border-box innerWidth(int) by roundtripping" );
+	assert.equal( el_bb.outerWidth( 117 ).width(), expected + 3, "test border-box outerWidth(int) by roundtripping" );
+	assert.equal( el_bb.outerWidth( 118, false ).width(), expected + 4, "test border-box outerWidth(int, false) by roundtripping" );
+	assert.equal( el_bb.outerWidth( 129, true ).width(), expected + 5, "test border-box innerWidth(int, true) by roundtripping" );
+
+	assert.equal( el_bb.height( 101 ).height(), expected + 1, "test border-box height(int) by roundtripping" );
+	assert.equal( el_bb.innerHeight( 108 ).height(), expected + 2, "test border-box innerHeight(int) by roundtripping" );
+	assert.equal( el_bb.outerHeight( 117 ).height(), expected + 3, "test border-box outerHeight(int) by roundtripping" );
+	assert.equal( el_bb.outerHeight( 118, false ).height(), expected + 4, "test border-box outerHeight(int, false) by roundtripping" );
+	assert.equal( el_bb.outerHeight( 129, true ).height(), expected + 5, "test border-box innerHeight(int, true) by roundtripping" );
+
+	assert.equal( el.width( 101 ).width(), expected + 1, "test border-box width(int) by roundtripping" );
+	assert.equal( el.innerWidth( 108 ).width(), expected + 2, "test border-box innerWidth(int) by roundtripping" );
+	assert.equal( el.outerWidth( 117 ).width(), expected + 3, "test border-box outerWidth(int) by roundtripping" );
+	assert.equal( el.outerWidth( 118, false ).width(), expected + 4, "test border-box outerWidth(int, false) by roundtripping" );
+	assert.equal( el.outerWidth( 129, true ).width(), expected + 5, "test border-box innerWidth(int, true) by roundtripping" );
+
+	assert.equal( el.height( 101 ).height(), expected + 1, "test border-box height(int) by roundtripping" );
+	assert.equal( el.innerHeight( 108 ).height(), expected + 2, "test border-box innerHeight(int) by roundtripping" );
+	assert.equal( el.outerHeight( 117 ).height(), expected + 3, "test border-box outerHeight(int) by roundtripping" );
+	assert.equal( el.outerHeight( 118, false ).height(), expected + 4, "test border-box outerHeight(int, false) by roundtripping" );
+	assert.equal( el.outerHeight( 129, true ).height(), expected + 5, "test border-box innerHeight(int, true) by roundtripping" );
 });
 
-testIframe( "dimensions/documentLarge", "window vs. large document", function( jQuery, window, document ) {
-	expect(2);
+testIframe(
+	"dimensions/documentLarge",
+	"window vs. large document",
+	function( jQuery, window, document, assert ) {
+		assert.expect(2);
 
-	ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height" );
-	ok( jQuery( document ).width() > jQuery( window ).width(), "document width is larger than window width" );
-});
+		assert.ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height" );
+		assert.ok( jQuery( document ).width() > jQuery( window ).width(), "document width is larger than window width" );
+	}
+);
 
-test( "allow modification of coordinates argument (gh-1848)", function() {
-	expect( 1 );
+QUnit.test( "allow modification of coordinates argument (gh-1848)", function( assert ) {
+	assert.expect( 1 );
 
 	var offsetTop,
 		element = jQuery( "<div/>" ).appendTo( "#qunit-fixture" );
@@ -475,7 +479,7 @@ test( "allow modification of coordinates argument (gh-1848)", function() {
 	});
 
 	offsetTop = element.offset().top;
-	ok( Math.abs(offsetTop - 100) < 0.02,
+	assert.ok( Math.abs(offsetTop - 100) < 0.02,
 		"coordinates are modified (got offset.top: " +  offsetTop + ")");
 });