Core: Shift to no globals

Author: apsdehal

tests/unit/core/core.js

@@ -1,147 +1,148 @@
 define( [
+	"qunit",
 	"jquery",
 	"lib/common",
 	"ui/form",
 	"ui/labels",
 	"ui/unique-id"
-], function( $, common ) {
+], function( QUnit, $, common ) {
 
-module( "core - jQuery extensions" );
+QUnit.module( "core - jQuery extensions" );
 
 common.testJshint( "core" );
 
-test( "innerWidth - getter", function() {
-	expect( 2 );
+QUnit.test( "innerWidth - getter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
-	equal( el.innerWidth(), 122, "getter passthru" );
+	assert.equal( el.innerWidth(), 122, "getter passthru" );
 	el.hide();
-	equal( el.innerWidth(), 122, "getter passthru when hidden" );
+	assert.equal( el.innerWidth(), 122, "getter passthru when hidden" );
 } );
 
-test( "innerWidth - setter", function() {
-	expect( 2 );
+QUnit.test( "innerWidth - setter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.innerWidth( 120 );
-	equal( el.width(), 98, "width set properly" );
+	assert.equal( el.width(), 98, "width set properly" );
 	el.hide();
 	el.innerWidth( 100 );
-	equal( el.width(), 78, "width set properly when hidden" );
+	assert.equal( el.width(), 78, "width set properly when hidden" );
 } );
 
-test( "innerHeight - getter", function() {
-	expect( 2 );
+QUnit.test( "innerHeight - getter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
-	equal( el.innerHeight(), 70, "getter passthru" );
+	assert.equal( el.innerHeight(), 70, "getter passthru" );
 	el.hide();
-	equal( el.innerHeight(), 70, "getter passthru when hidden" );
+	assert.equal( el.innerHeight(), 70, "getter passthru when hidden" );
 } );
 
-test( "innerHeight - setter", function() {
-	expect( 2 );
+QUnit.test( "innerHeight - setter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.innerHeight( 60 );
-	equal( el.height(), 40, "height set properly" );
+	assert.equal( el.height(), 40, "height set properly" );
 	el.hide();
 	el.innerHeight( 50 );
-	equal( el.height(), 30, "height set properly when hidden" );
+	assert.equal( el.height(), 30, "height set properly when hidden" );
 } );
 
-test( "outerWidth - getter", function() {
-	expect( 2 );
+QUnit.test( "outerWidth - getter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
-	equal( el.outerWidth(), 140, "getter passthru" );
+	assert.equal( el.outerWidth(), 140, "getter passthru" );
 	el.hide();
-	equal( el.outerWidth(), 140, "getter passthru when hidden" );
+	assert.equal( el.outerWidth(), 140, "getter passthru when hidden" );
 } );
 
-test( "outerWidth - setter", function() {
-	expect( 2 );
+QUnit.test( "outerWidth - setter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerWidth( 130 );
-	equal( el.width(), 90, "width set properly" );
+	assert.equal( el.width(), 90, "width set properly" );
 	el.hide();
 	el.outerWidth( 120 );
-	equal( el.width(), 80, "width set properly when hidden" );
+	assert.equal( el.width(), 80, "width set properly when hidden" );
 } );
 
-test( "outerWidth(true) - getter", function() {
-	expect( 2 );
+QUnit.test( "outerWidth(true) - getter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
-	equal( el.outerWidth( true ), 154, "getter passthru w/ margin" );
+	assert.equal( el.outerWidth( true ), 154, "getter passthru w/ margin" );
 	el.hide();
-	equal( el.outerWidth( true ), 154, "getter passthru w/ margin when hidden" );
+	assert.equal( el.outerWidth( true ), 154, "getter passthru w/ margin when hidden" );
 } );
 
-test( "outerWidth(true) - setter", function() {
-	expect( 2 );
+QUnit.test( "outerWidth(true) - setter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerWidth( 130, true );
-	equal( el.width(), 76, "width set properly" );
+	assert.equal( el.width(), 76, "width set properly" );
 	el.hide();
 	el.outerWidth( 120, true );
-	equal( el.width(), 66, "width set properly when hidden" );
+	assert.equal( el.width(), 66, "width set properly when hidden" );
 } );
 
-test( "outerHeight - getter", function() {
-	expect( 2 );
+QUnit.test( "outerHeight - getter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
-	equal( el.outerHeight(), 86, "getter passthru" );
+	assert.equal( el.outerHeight(), 86, "getter passthru" );
 	el.hide();
-	equal( el.outerHeight(), 86, "getter passthru when hidden" );
+	assert.equal( el.outerHeight(), 86, "getter passthru when hidden" );
 } );
 
-test( "outerHeight - setter", function() {
-	expect( 2 );
+QUnit.test( "outerHeight - setter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerHeight( 80 );
-	equal( el.height(), 44, "height set properly" );
+	assert.equal( el.height(), 44, "height set properly" );
 	el.hide();
 	el.outerHeight( 70 );
-	equal( el.height(), 34, "height set properly when hidden" );
+	assert.equal( el.height(), 34, "height set properly when hidden" );
 } );
 
-test( "outerHeight(true) - getter", function() {
-	expect( 2 );
+QUnit.test( "outerHeight(true) - getter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
-	equal( el.outerHeight( true ), 98, "getter passthru w/ margin" );
+	assert.equal( el.outerHeight( true ), 98, "getter passthru w/ margin" );
 	el.hide();
-	equal( el.outerHeight( true ), 98, "getter passthru w/ margin when hidden" );
+	assert.equal( el.outerHeight( true ), 98, "getter passthru w/ margin when hidden" );
 } );
 
-test( "outerHeight(true) - setter", function() {
-	expect( 2 );
+QUnit.test( "outerHeight(true) - setter", function( assert ) {
+	assert.expect( 2 );
 	var el = $( "#dimensions" );
 
 	el.outerHeight( 90, true );
-	equal( el.height(), 42, "height set properly" );
+	assert.equal( el.height(), 42, "height set properly" );
 	el.hide();
 	el.outerHeight( 80, true );
-	equal( el.height(), 32, "height set properly when hidden" );
+	assert.equal( el.height(), 32, "height set properly when hidden" );
 } );
 
-test( "uniqueId / removeUniqueId", function() {
-	expect( 3 );
+QUnit.test( "uniqueId / removeUniqueId", function( assert ) {
+	assert.expect( 3 );
 	var el = $( "img" ).eq( 0 );
-	equal( el.attr( "id" ), null, "element has no initial id" );
+	assert.equal( el.attr( "id" ), null, "element has no initial id" );
 	el.uniqueId();
-	ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" );
+	assert.ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" );
 	el.removeUniqueId();
-	equal( el.attr( "id" ), null, "unique id has been removed from element" );
+	assert.equal( el.attr( "id" ), null, "unique id has been removed from element" );
 } );
 
-test( "Labels", function() {
-	expect( 2 );
+QUnit.test( "Labels", function( assert ) {
+	assert.expect( 2 );
 
 	var expected = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "10" ];
 	var dom = $( "#labels-fragment" );
@@ -155,7 +156,7 @@ test( "Labels", function() {
 				return $.trim( $( this ).text() );
 			} ).get();
 
-		deepEqual( found, expected,
+		assert.deepEqual( found, expected,
 			".labels() finds all labels in " + testType + ", and sorts them in DOM order" );
 	}
 
@@ -176,8 +177,9 @@ test( "Labels", function() {
 		inputs.each( function() {
 			var input = $( this );
 
-			asyncTest( name + this.id.replace( /_/g, " " ), function() {
-				expect( 1 );
+			QUnit.test( name + this.id.replace( /_/g, " " ), function( assert ) {
+				var ready = assert.async();
+				assert.expect( 1 );
 				var form = input.form();
 
 				// If input has a form the value should reset to "" if not it should be "changed"
@@ -193,8 +195,8 @@ test( "Labels", function() {
 				} );
 
 				setTimeout( function() {
-					equal( input.val(), value, "Proper form found for #" + input.attr( "id" ) );
-					start();
+					assert.equal( input.val(), value, "Proper form found for #" + input.attr( "id" ) );
+					ready();
 				} );
 			} );
 		} );