Tests: Upgrade QUnit to 2.0.

Closes #1777. #1681.
jquery-validation · Jul 22, 2016 · 8fe4a90 · 8fe4a90
1 parent 0d3ede1
commit 8fe4a90
Show file tree

Hide file tree

Showing 13 changed files with 1,631 additions and 5,756 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -17,7 +17,7 @@ banner = "/*!\n" +
 	" * <%= pkg.homepage %>\n" +
 	" *\n" +
 	" * Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>\n" +
-	" * Released under the <%= _.pluck(pkg.licenses, 'type').join(', ') %> license\n" +
+	" * Released under the <%= _.map(pkg.licenses, 'type').join(', ') %> license\n" +
 	" */\n";
 
 // Define UMD wrapper variables

diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
 		"grunt-contrib-watch": "1.0.0",
 		"grunt-jscs": "2.8.0",
 		"grunt-text-replace": "0.4.0",
-		"qunitjs": "2.0.0-rc1"
+		"qunitjs": "2.0.0"
 	},
 	"keywords": [
 		"jquery",

diff --git a/test/.jshintrc b/test/.jshintrc
@@ -17,26 +17,8 @@
 	"jquery": true,
 
 	"globals": {
-		"asyncTest": false,
-		"closeEnough": false,
-		"deepEqual": false,
-		"domEqual": false,
-		"equal": false,
-		"expect": false,
-		"Globalize": false,
 		"methodTest": false,
-		"module": false,
-		"notEqual": false,
-		"notDeepEqual": false,
-		"notStrictEqual": false,
-		"ok": false,
 		"QUnit": true,
-		"start": false,
-		"strictEqual": false,
-		"stop": false,
-		"test": false,
-		"TestHelpers": true,
-		"throws": false,
 		"JSHINT": false
 	}
 }
diff --git a/test/additional/creditcard.js b/test/additional/creditcard.js
@@ -1,7 +1,7 @@
-test( "creditcard", function() {
+QUnit.test( "creditcard", function( assert ) {
 	var method = methodTest( "creditcard" );
-	ok( method( "4111-1111-1111-1111" ), "Valid creditcard number" );
-	ok( method( "4111 1111 1111 1111" ), "Valid creditcard number" );
-	ok( !method( "41111" ), "Invalid creditcard number" );
-	ok( !method( "asdf" ), "Invalid creditcard number" );
+	assert.ok( method( "4111-1111-1111-1111" ), "Valid creditcard number" );
+	assert.ok( method( "4111 1111 1111 1111" ), "Valid creditcard number" );
+	assert.ok( !method( "41111" ), "Invalid creditcard number" );
+	assert.ok( !method( "asdf" ), "Invalid creditcard number" );
 } );
diff --git a/test/aria.js b/test/aria.js
@@ -1,6 +1,6 @@
-module( "aria" );
+QUnit.module( "aria" );
 
-test( "Invalid field adds aria-invalid=true", function() {
+QUnit.test( "Invalid field adds aria-invalid=true", function( assert ) {
 	var ariaInvalidFirstName = $( "#ariaInvalidFirstName" ),
 		form = $( "#ariaInvalid" );
 
@@ -11,10 +11,10 @@ test( "Invalid field adds aria-invalid=true", function() {
 	} );
 	ariaInvalidFirstName.val( "" );
 	ariaInvalidFirstName.valid();
-	equal( ariaInvalidFirstName.attr( "aria-invalid" ), "true" );
+	assert.equal( ariaInvalidFirstName.attr( "aria-invalid" ), "true" );
 } );
 
-test( "Valid field adds aria-invalid=false", function() {
+QUnit.test( "Valid field adds aria-invalid=false", function( assert ) {
 	var ariaInvalidFirstName = $( "#ariaInvalidFirstName" ),
 		form = $( "#ariaInvalid" );
 
@@ -25,11 +25,11 @@ test( "Valid field adds aria-invalid=false", function() {
 	} );
 	ariaInvalidFirstName.val( "not empty" );
 	ariaInvalidFirstName.valid();
-	equal( ariaInvalidFirstName.attr( "aria-invalid" ), "false" );
-	equal( $( "#ariaInvalid [aria-invalid=false]" ).length, 1 );
+	assert.equal( ariaInvalidFirstName.attr( "aria-invalid" ), "false" );
+	assert.equal( $( "#ariaInvalid [aria-invalid=false]" ).length, 1 );
 } );
 
-test( "resetForm(): removes all aria-invalid attributes", function() {
+QUnit.test( "resetForm(): removes all aria-invalid attributes", function( assert ) {
 	var ariaInvalidFirstName = $( "#ariaInvalidFirstName" ),
 		form = $( "#ariaInvalid" ),
 		validator = form.validate( {
@@ -41,34 +41,34 @@ test( "resetForm(): removes all aria-invalid attributes", function() {
 	ariaInvalidFirstName.val( "not empty" );
 	ariaInvalidFirstName.valid();
 	validator.resetForm();
-	equal( $( "#ariaInvalid [aria-invalid]" ).length, 0, "resetForm() should remove any aria-invalid attributes" );
+	assert.equal( $( "#ariaInvalid [aria-invalid]" ).length, 0, "resetForm() should remove any aria-invalid attributes" );
 } );
 
-test( "Static required field adds aria-required", function() {
+QUnit.test( "Static required field adds aria-required", function( assert ) {
 	var ariaRequiredStatic = $( "#ariaRequiredStatic" ),
 		form = $( "#ariaRequired" );
 
 	form.validate();
-	equal( ariaRequiredStatic.attr( "aria-required" ), "true" );
+	assert.equal( ariaRequiredStatic.attr( "aria-required" ), "true" );
 } );
 
-test( "Data required field adds aria-required", function() {
+QUnit.test( "Data required field adds aria-required", function( assert ) {
 	var ariaRequiredData = $( "#ariaRequiredData" ),
 		form = $( "#ariaRequired" );
 
 	form.validate();
-	equal( ariaRequiredData.attr( "aria-required" ), "true" );
+	assert.equal( ariaRequiredData.attr( "aria-required" ), "true" );
 } );
 
-test( "Class required field adds aria-required", function() {
+QUnit.test( "Class required field adds aria-required", function( assert ) {
 	var ariaRequiredClass = $( "#ariaRequiredClass" ),
 		form = $( "#ariaRequired" );
 
 	form.validate();
-	equal( ariaRequiredClass.attr( "aria-required" ), "true" );
+	assert.equal( ariaRequiredClass.attr( "aria-required" ), "true" );
 } );
 
-test( "Dynamically required field adds aria-required after valid()", function() {
+QUnit.test( "Dynamically required field adds aria-required after valid()", function( assert ) {
 	var ariaRequiredDynamic = $( "#ariaRequiredDynamic" ),
 		form = $( "#ariaRequired" );
 
@@ -79,5 +79,5 @@ test( "Dynamically required field adds aria-required after valid()", function()
 		}
 	} );
 	ariaRequiredDynamic.valid();
-	equal( ariaRequiredDynamic.attr( "aria-required" ), "true" );
+	assert.equal( ariaRequiredDynamic.attr( "aria-required" ), "true" );
 } );