Build: Run JSCS against tests

2025-12-14 20:35:47 +01:00 · 2014-05-27 00:08:54 -04:00
parent 56a2a18368
commit d0c56e005e
6 changed files with 214 additions and 149 deletions
--- a/.jscsrc
+++ b/.jscsrc
@@ -16,6 +16,7 @@
 	"requireMultipleVarDecl": "onevar",
 	"disallowTrailingWhitespace": true,
 	"validateQuoteMarks": "\"",
+	"requireSpacesInsideArrayBrackets": "allButNested",
 	"excludeFiles": [
 		"node_modules/**",
 		"dist/**"
--- a/test/error-placement.js
+++ b/test/error-placement.js
@@ -7,13 +7,36 @@ test( "elements() order", function() {
 			wrap: "li"
 		});

-	deepEqual( v.elements().map( function() {
+	deepEqual(
+		v.elements().map( function() {
 			return $( this ).attr( "id" );
-	}).get(), ["order1", "order2", "order3", "order4", "order5", "order6"], "elements must be in document order" );
+		}).get(),
+		[
+			"order1",
+			"order2",
+			"order3",
+			"order4",
+			"order5",
+			"order6"
+		],
+		"elements must be in document order"
+	);
+
 	v.form();
-	deepEqual( container.children().map( function() {
+	deepEqual(
+		container.children().map( function() {
 			return $( this ).attr( "id" );
-	}).get(), ["order1-error", "order2-error", "order3-error", "order4-error", "order5-error", "order6-error"], "labels in error container must be in document order" );
+		}).get(),
+		[
+			"order1-error",
+			"order2-error",
+			"order3-error",
+			"order4-error",
+			"order5-error",
+			"order6-error"
+		],
+		"labels in error container must be in document order"
+	);
 });

 test( "error containers, simple", function() {
@@ -33,7 +56,21 @@ test( "error containers, simple", function() {
 	equal( "", container.find( "h3" ).html() );

 	v.prepareForm();
-	v.errorList = [{message:"bar", element: {name:"foo"}}, {message: "necessary", element: {name:"required"}}];
+	v.errorList = [
+		{
+			message: "bar",
+			element: {
+				name: "foo"
+			}
+		},
+		{
+			message: "necessary",
+			element: {
+				name: "required"
+			}
+		}
+	];
+
 	ok( !v.valid(), "form is not valid after adding errors manually" );
 	v.showErrors();
 	equal( container.find( ".error:not(input)" ).length, 2, "There should be two error labels" );
@@ -68,7 +105,22 @@ test( "error containers, with labelcontainer I", function() {
 	equal( 0, labelcontainer.find( ".error:not(input)" ).length, "There should be no error labels in the labelcontainer" );
 	equal( 0, labelcontainer.find( "li" ).length, "There should be no lis labels in the labelcontainer" );

-	v.errorList = [{message:"bar", element: {name:"foo"}}, {name: "required", message: "necessary", element: {name:"required"}}];
+	v.errorList = [
+		{
+			message: "bar",
+			element: {
+				name: "foo"
+			}
+		},
+		{
+			name: "required",
+			message: "necessary",
+			element: {
+				name: "required"
+			}
+		}
+	];
+
 	ok( !v.valid(), "form is not valid after adding errors manually" );
 	v.showErrors();
 	equal( 0, container.find( ".error:not(input)" ).length, "There should be no error label in the container" );
@@ -110,7 +162,12 @@ test( "errorcontainer, show/hide only on submit", function() {
 	ok( container.is( ":visible" ), "must be visible" );

 	$( "#firstname" ).val( "hix" ).keyup();
-	$( "#testForm1" ).triggerHandler( "keyup", [jQuery.event.fix({ type: "keyup", target: $( "#firstname" )[0] })]);
+	$( "#testForm1" ).triggerHandler( "keyup", [
+			jQuery.event.fix({
+				type: "keyup",
+				target: $( "#firstname" )[ 0 ]
+			})
+		]);
 	equal( 1, labelContainer.find( ".error:visible" ).length );
 	equal( "There are 1 errors in your form.", container.html() );

--- a/test/messages.js
+++ b/test/messages.js
@@ -57,7 +57,6 @@ test("read messages from metadata", function() {
 	equal( form.find("#testGeneric9").next(".error:not(input)").text(), "email" );
 });

-
 test("read messages from metadata, with meta option specified, but no metadata in there", function() {
 	var form = $("#testForm1clean");
 	form.validate({
--- a/test/methods.js
+++ b/test/methods.js
@@ -420,7 +420,6 @@ asyncTest("remote, customized ajax options", function() {
 	$("#userForm").valid();
 });

-
 asyncTest("remote extensions", function() {
 	expect(5);
 	var e = $("#username"),
@@ -507,14 +506,12 @@ asyncTest("remote reset clear old value", function() {

 		$(document).unbind("ajaxStop");

-
 		$(document).ajaxStop(function() {
 			clearTimeout(waitTimeout);
 			ok( true, "Remote request sent to server" );
 			start();
 		});

-
 		v.resetForm();
 		e.val("asdf");
 		waitTimeout = setTimeout(function() {
--- a/test/rules.js
+++ b/test/rules.js
@@ -257,7 +257,6 @@ test("rules(), add and remove static rules", function() {
 	$("#firstnamec").rules("add", "required email");
 	deepEqual( $("#firstnamec").rules(), { required: true, email: true } );

-
 	deepEqual( $("#lastnamec").rules(), {} );
 	$("#lastnamec").rules("add", "required");
 	$("#lastnamec").rules("add", {
@@ -265,7 +264,6 @@ test("rules(), add and remove static rules", function() {
 	});
 	deepEqual( $("#lastnamec").rules(), { required: true, minlength: 2 } );

-
 	var removedRules = $("#lastnamec").rules("remove", "required email");
 	deepEqual( $("#lastnamec").rules(), { minlength: 2 } );
 	$("#lastnamec").rules("add", removedRules);
--- a/test/test.js
+++ b/test/test.js
@@ -10,20 +10,27 @@ $.mockjax({
 	responseStatus: 200,
 	responseTime: 1
 });
+
 $.mockjax({
 	url: "users.php",
-	data: { username: /Peter2?|asdf/},
+	data: {
+		username: /Peter2?|asdf/
+	},
 	responseText: "false",
 	responseStatus: 200,
 	responseTime: 1
 });
+
 $.mockjax({
 	url: "users2.php",
-	data: { username: "asdf"},
+	data: {
+		username: "asdf"
+	},
 	responseText: "\"asdf is already taken, please try something else\"",
 	responseStatus: 200,
 	responseTime: 1
 });
+
 $.mockjax({
 	url: "echo.php",
 	response: function( data ) {
@@ -158,7 +165,11 @@ test( "form(): checkboxes: min/required", function() {
 test( "form(): radio buttons: required", function() {
 	expect( 6 );
 	var form = $( "#testForm10" )[ 0 ],
-		v = $( form ).validate({ rules: { testForm10Radio: "required"} });
+		v = $( form ).validate({
+			rules: {
+				testForm10Radio: "required"
+			}
+		});

 	ok(!v.form(), "Invalid Form" );
 	equal($( "#testForm10Radio1" ).attr( "class" ), "error" );
@@ -210,7 +221,6 @@ test( "form(): with equalTo and onfocusout=false", function() {
 	ok( !v.form(), "Invalid form" );
 });

-
 test( "check(): simple", function() {
 	expect( 3 );
 	var element = $( "#firstname" )[ 0 ],
@@ -290,16 +300,24 @@ test( "hide(): container", function() {

 test( "valid()", function() {
 	expect( 4 );
-	var errorList = [{ name:"meal", message:"foo", element:$( "#meal" )[ 0 ] }],
+	var errorList = [
+			{
+				name: "meal",
+				message: "foo",
+				element: $( "#meal" )[ 0 ]
+			}
+		],
 		v = $( "#testForm3" ).validate();

 	ok( v.valid(), "No errors, must be valid" );
 	v.errorList = errorList;
 	ok( !v.valid(), "One error, must be invalid" );
 	QUnit.reset();
-	v = $( "#testForm3" ).validate({ submitHandler: function() {
+	v = $( "#testForm3" ).validate({
+		submitHandler: function() {
 			ok( false, "Submit handler was called" );
-	}});
+		}
+	});
 	ok( v.valid(), "No errors, must be valid and returning true, even with the submit handler" );
 	v.errorList = errorList;
 	ok( !v.valid(), "One error, must be invalid, no call to submit handler" );
@@ -853,7 +871,6 @@ test( "bypassing validation on form submission",function () {
 	equal($v.numberOfInvalids(), 1, "Validation failed correctly" );
 });

-
 module( "misc" );

 test( "success option", function() {
@@ -961,7 +978,6 @@ test( "success is called for optional elements with other rules", function() {
 	delete $.validator.methods.custom1;
 });

-
 test( "success callback with element", function() {
 	expect( 1 );
 	var v = $( "#userForm" ).validate({
@@ -984,7 +1000,10 @@ test( "all rules are evaluated even if one returns a dependency-mistmatch", func
 	}, "" );
 	var v = $( "#testForm1" ).validate({
 		rules: {
-			firstname: {email:true, custom1: true}
+			firstname: {
+				email: true,
+				custom1: true
+			}
 		}
 	});
 	equal( 0, $( "#testForm1 .error:not(input)" ).size() );
@@ -1539,7 +1558,6 @@ test( "calling blur on ignored element", function() {
 	equal( form.valid(), false, "valid() should return false" );
 });

-
 test( "Min and Max type absent set by attributes greater", function() {
 	var form = $( "#ranges" ),
 		name = $( "#rangeAbsentInvalidGreater" ),
@@ -1579,8 +1597,6 @@ test( "Min and Max type absent set by attributes valid", function() {
 	equal( label.text(), "", "Correct error label" );
 });

-
-
 test( "Min and Max range set by attributes valid", function() {
 	//
 	// cannot test for overflow:
@@ -1601,7 +1617,6 @@ test( "Min and Max range set by attributes valid", function() {
 	equal( label.text(), "", "Correct error label" );
 });

-
 test( "Min and Max number set by attributes valid", function() {
 	var form = $( "#ranges" ),
 		name = $( "#rangeNumberValid" ),
@@ -1615,7 +1630,6 @@ test( "Min and Max number set by attributes valid", function() {
 	equal( label.text(), "", "Correct error label" );
 });

-
 test( "Min and Max number set by attributes greater", function() {
 	var form = $( "#ranges" ),
 		name = $( "#rangeNumberInvalidGreater" ),
@@ -1629,7 +1643,6 @@ test( "Min and Max number set by attributes greater", function() {
 	equal( label.text(), "Please enter a value less than or equal to 200.", "Correct error label" );
 });

-
 test( "Min and Max number set by attributes less", function() {
 	var form = $( "#ranges" ),
 		name = $( "#rangeNumberInvalidLess" ),