Skip to content

Commit b5cd04e

Browse files
jzaeffererjzaefferer
committed
Lint test files
1 parent 2b1b256 commit b5cd04e

File tree

5 files changed

+73
-52
lines changed

5 files changed

+73
-52
lines changed

‎grunt.js

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ grunt.initConfig({
4545
'jquery.validate.js',
4646
'additional-methods.js',
4747
'localization/*.js'
48+
],
49+
test: [
50+
'test/test.js',
51+
'test/rules.js',
52+
'test/messages.js',
53+
'test/methods.js'
4854
]
4955
},
5056
jshint: {
@@ -63,7 +69,18 @@ grunt.initConfig({
6369
globals: {
6470
jQuery: true,
6571
$: true,
66-
console: true
72+
console: true,
73+
/* TODO only allows these for tests (grunt 0.4) */
74+
QUnit: true,
75+
module: true,
76+
test: true,
77+
start: true,
78+
stop: true,
79+
expect: true,
80+
ok: true,
81+
equal: true,
82+
deepEqual: true,
83+
strictEqual: true
6784
}
6885
}
6986
});

‎test/messages.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ test("group error messages", function() {
4040
});
4141

4242
test("read messages from metadata", function() {
43-
var form = $("#testForm9")
43+
var form = $("#testForm9");
4444
form.validate();
45-
var e = $("#testEmail9")
45+
var e = $("#testEmail9");
4646
e.valid();
4747
equal( form.find("label").text(), "required" );
4848
e.val("bla").valid();
@@ -51,7 +51,7 @@ test("read messages from metadata", function() {
5151

5252

5353
test("read messages from metadata, with meta option specified, but no metadata in there", function() {
54-
var form = $("#testForm1clean")
54+
var form = $("#testForm1clean");
5555
form.validate({
5656
meta: "validate",
5757
rules: {

‎test/methods.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,10 @@ test("extension", function() {
353353
ok( method( "picture.png" ), "Valid default accept type" );
354354
ok( !method( "picture.pgn" ), "Invalid default accept type" );
355355

356-
var v = jQuery("#form").validate(),
357-
method = function(value, param) {
358-
return $.validator.methods.extension.call(v, value, $('#text1')[0], param);
359-
};
356+
var v = jQuery("#form").validate();
357+
method = function(value, param) {
358+
return $.validator.methods.extension.call(v, value, $('#text1')[0], param);
359+
};
360360
ok( method( "picture.doc", "doc"), "Valid custom accept type" );
361361
ok( method( "picture.pdf", "doc|pdf"), "Valid custom accept type" );
362362
ok( method( "picture.pdf", "pdf|doc"), "Valid custom accept type" );
@@ -472,8 +472,9 @@ test("remote extensions", function() {
472472
strictEqual( v.element(e), true, "still invalid, because remote validation must block until it returns; dependency-mismatch considered as valid though" );
473473
});
474474

475-
asyncTest("remote radio correct value sent", function() {
475+
test("remote radio correct value sent", function() {
476476
expect(1);
477+
stop();
477478
var e = $("#testForm10Radio2");
478479
e.attr('checked', 'checked');
479480
var v = $("#testForm10").validate({
@@ -495,9 +496,9 @@ asyncTest("remote radio correct value sent", function() {
495496
v.element(e);
496497
});
497498

498-
asyncTest("remote reset clear old value", function() {
499+
test("remote reset clear old value", function() {
499500
expect(1);
500-
501+
stop();
501502
var e = $("#username");
502503
var v = $("#userForm").validate({
503504
rules: {
@@ -507,7 +508,7 @@ asyncTest("remote reset clear old value", function() {
507508
url: "echo.php",
508509
dataFilter: function(data) {
509510
var json = JSON.parse(data);
510-
if(json.username == 'asdf') {
511+
if(json.username === 'asdf') {
511512
return "\"asdf is already taken\"";
512513
}
513514
return "\"" + true + "\"";

‎test/rules.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ test("rules(), gurantee that required is at front", function() {
9191
$("#subformRequired").validate();
9292
function flatRules(element) {
9393
var result = [];
94-
jQuery.each($(element).rules(), function(key, value) { result.push(key) });
94+
jQuery.each($(element).rules(), function(key, value) { result.push(key); });
9595
return result.join(" ");
9696
}
9797
equal( "required minlength", flatRules("#firstname") );
@@ -169,7 +169,7 @@ test("rules(), dependency checks", function() {
169169
min: {
170170
param: 5,
171171
depends: function(el) {
172-
return /^a/.test($(el).val());
172+
return (/^a/).test($(el).val());
173173
}
174174
}
175175
},
@@ -222,7 +222,7 @@ test("rules(), add and remove static rules", function() {
222222
});
223223
deepEqual( $("#firstnamec").rules(), { required: true, date: true } );
224224

225-
$("#firstnamec").rules("remove", "date")
225+
$("#firstnamec").rules("remove", "date");
226226
deepEqual( $("#firstnamec").rules(), { required: true } );
227227
$("#firstnamec").rules("add", "email");
228228
deepEqual( $("#firstnamec").rules(), { required: true, email: true } );

‎test/test.js

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
window.sessionStorage && sessionStorage.clear();
1+
if ( window.sessionStorage ) {
2+
sessionStorage.clear();
3+
}
24
jQuery.validator.defaults.debug = true;
35
$.mockjaxSettings.log = $.noop;
46

@@ -80,20 +82,20 @@ test("valid() plugin method, special handling for checkable groups", function()
8082
test("addMethod", function() {
8183
expect( 3 );
8284
$.validator.addMethod("hi", function(value) {
83-
return value == "hi";
85+
return value === "hi";
8486
}, "hi me too");
8587
var method = $.validator.methods.hi,
8688
e = $('#text1')[0];
8789
ok( !method(e.value, e), "Invalid" );
8890
e.value = "hi";
8991
ok( method(e.value, e), "Invalid" );
90-
ok( jQuery.validator.messages.hi == "hi me too", "Check custom message" );
92+
ok( jQuery.validator.messages.hi === "hi me too", "Check custom message" );
9193
});
9294

9395
test("addMethod2", function() {
9496
expect( 4 );
9597
$.validator.addMethod("complicatedPassword", function(value, element, param) {
96-
return this.optional(element) || /\D/.test(value) && /\d/.test(value)
98+
return this.optional(element) || /\D/.test(value) && /\d/.test(value);
9799
}, "Your password must contain at least one number and one letter");
98100
var v = jQuery("#form").validate({
99101
rules: {
@@ -189,13 +191,13 @@ test("check(): simple", function() {
189191
expect( 3 );
190192
var element = $('#firstname')[0];
191193
var v = $('#testForm1').validate();
192-
ok( v.size() == 0, 'No errors yet' );
194+
ok( v.size() === 0, 'No errors yet' );
193195
v.check(element);
194-
ok( v.size() == 1, 'error exists' );
196+
ok( v.size() === 1, 'error exists' );
195197
v.errorList = [];
196198
$('#firstname').val("hi");
197199
v.check(element);
198-
ok( !v.size() == 1, 'No more errors' );
200+
ok( v.size() === 0, 'No more errors' );
199201
});
200202

201203
test("hide(): input", function() {
@@ -275,12 +277,12 @@ test("submitHandler keeps submitting button", function() {
275277
submitHandler: function(form) {
276278
// dunno how to test this better; this tests the implementation that uses a hidden input
277279
var hidden = $(form).find("input:hidden")[0];
278-
deepEqual(hidden.value, button.value)
279-
deepEqual(hidden.name, button.name)
280+
deepEqual(hidden.value, button.value);
281+
deepEqual(hidden.name, button.name);
280282
}
281283
});
282284
$("#username").val("bla");
283-
var button = $("#userForm :submit")[0]
285+
var button = $("#userForm :submit")[0];
284286
var event = $.Event("click");
285287
event.preventDefault();
286288
$.event.trigger(event, null, button);
@@ -365,13 +367,13 @@ test("showErrors() - custom handler", function() {
365367

366368
test("option: (un)highlight, default", function() {
367369
$("#testForm1").validate();
368-
var e = $("#firstname")
370+
var e = $("#firstname");
369371
ok( !e.hasClass("error") );
370372
ok( !e.hasClass("valid") );
371-
e.valid()
373+
e.valid();
372374
ok( e.hasClass("error") );
373375
ok( !e.hasClass("valid") );
374-
e.val("hithere").valid()
376+
e.val("hithere").valid();
375377
ok( !e.hasClass("error") );
376378
ok( e.hasClass("valid") );
377379
});
@@ -382,11 +384,11 @@ test("option: (un)highlight, nothing", function() {
382384
highlight: false,
383385
unhighlight: false
384386
});
385-
var e = $("#firstname")
387+
var e = $("#firstname");
386388
ok( !e.hasClass("error") );
387-
e.valid()
389+
e.valid();
388390
ok( !e.hasClass("error") );
389-
e.valid()
391+
e.valid();
390392
ok( !e.hasClass("error") );
391393
});
392394

@@ -398,19 +400,19 @@ test("option: (un)highlight, custom", function() {
398400
$(element).hide();
399401
},
400402
unhighlight: function(element, errorClass) {
401-
equal( "invalid", errorClass )
403+
equal( "invalid", errorClass );
402404
$(element).show();
403405
},
404406
errorClass: "invalid",
405407
rules: {
406408
firstname: "required"
407409
}
408410
});
409-
var e = $("#firstnamec")
411+
var e = $("#firstnamec");
410412
ok( e.is(":visible") );
411-
e.valid()
413+
e.valid();
412414
ok( !e.is(":visible") );
413-
e.val("hithere").valid()
415+
e.val("hithere").valid();
414416
ok( e.is(":visible") );
415417
});
416418

@@ -427,20 +429,20 @@ test("option: (un)highlight, custom2", function() {
427429
},
428430
errorClass: "invalid"
429431
});
430-
var e = $("#firstname")
431-
var l = $("#errorFirstname")
432+
var e = $("#firstname");
433+
var l = $("#errorFirstname");
432434
ok( !e.is(".invalid") );
433435
ok( !l.is(".invalid") );
434-
e.valid()
436+
e.valid();
435437
ok( e.is(".invalid") );
436438
ok( l.is(".invalid") );
437-
e.val("hithere").valid()
439+
e.val("hithere").valid();
438440
ok( !e.is(".invalid") );
439441
ok( !l.is(".invalid") );
440442
});
441443

442444
test("option: focusCleanup default false", function() {
443-
var form = $("#userForm")
445+
var form = $("#userForm");
444446
form.validate();
445447
form.valid();
446448
ok( form.is(":has(label.error[for=username]:visible)"));
@@ -449,7 +451,7 @@ test("option: focusCleanup default false", function() {
449451
});
450452

451453
test("option: focusCleanup true", function() {
452-
var form = $("#userForm")
454+
var form = $("#userForm");
453455
form.validate({
454456
focusCleanup: true
455457
});
@@ -460,7 +462,7 @@ test("option: focusCleanup true", function() {
460462
});
461463

462464
test("option: focusCleanup with wrapper", function() {
463-
var form = $("#userForm")
465+
var form = $("#userForm");
464466
form.validate({
465467
focusCleanup: true,
466468
wrapper: "span"
@@ -472,7 +474,7 @@ test("option: focusCleanup with wrapper", function() {
472474
});
473475

474476
test("option: errorClass with multiple classes", function() {
475-
var form = $("#userForm")
477+
var form = $("#userForm");
476478
form.validate({
477479
focusCleanup: true,
478480
wrapper: "span",
@@ -510,14 +512,14 @@ test("formatAndAdd", function() {
510512
expect(4);
511513
var v = $("#form").validate();
512514
var fakeElement = { form: $("#form")[0], name: "bar" };
513-
v.formatAndAdd(fakeElement, {method: "maxlength", parameters: 2})
515+
v.formatAndAdd(fakeElement, {method: "maxlength", parameters: 2});
514516
equal( "Please enter no more than 2 characters.", v.errorList[0].message );
515517
equal( "bar", v.errorList[0].element.name );
516518

517-
v.formatAndAdd(fakeElement, {method: "range", parameters:[2,4]})
519+
v.formatAndAdd(fakeElement, {method: "range", parameters:[2,4]});
518520
equal( "Please enter a value between 2 and 4.", v.errorList[1].message );
519521

520-
v.formatAndAdd(fakeElement, {method: "range", parameters:[0,4]})
522+
v.formatAndAdd(fakeElement, {method: "range", parameters:[0,4]});
521523
equal( "Please enter a value between 0 and 4.", v.errorList[2].message );
522524
});
523525

@@ -530,7 +532,7 @@ test("formatAndAdd2", function() {
530532
equal( 0, param );
531533
return "element " + element.name + " is not valid";
532534
};
533-
v.formatAndAdd(fakeElement, {method: "test1", parameters: 0})
535+
v.formatAndAdd(fakeElement, {method: "test1", parameters: 0});
534536
equal( "element bar is not valid", v.errorList[0].message );
535537
});
536538

@@ -551,7 +553,7 @@ test("formatAndAdd, auto detect substitution string", function() {
551553
$("#firstnamec").val("abc");
552554
v.form();
553555
equal( "at least 5, up to 10", v.errorList[0].message );
554-
})
556+
});
555557

556558
test("error containers, simple", function() {
557559
expect(14);
@@ -802,7 +804,7 @@ test("validating groups settings parameter", function() {
802804
groups: {
803805
arrayGroup: ["input one", "input-two", "input three"],
804806
stringGroup: "input-four input-five input-six"
805-
},
807+
}
806808
});
807809
equal(validate.groups["input one"], "arrayGroup");
808810
equal(validate.groups["input-two"], "arrayGroup");
@@ -956,8 +958,9 @@ test("option: ignore", function() {
956958

957959
test("option: subformRequired", function() {
958960
jQuery.validator.addMethod("billingRequired", function(value, element) {
959-
if ($("#bill_to_co").is(":checked"))
961+
if ($("#bill_to_co").is(":checked")) {
960962
return $(element).parents("#subform").length;
963+
}
961964
return !this.optional(element);
962965
}, "");
963966
var v = $("#subformRequired").validate();
@@ -978,7 +981,7 @@ test("expression: :blank", function() {
978981
equal( 1, $(e).filter(":blank").length );
979982
e.value = " ";
980983
equal( 1, $(e).filter(":blank").length );
981-
e.value = " "
984+
e.value = " ";
982985
equal( 1, $(e).filter(":blank").length );
983986
e.value= " a ";
984987
equal( 0, $(e).filter(":blank").length );
@@ -989,7 +992,7 @@ test("expression: :filled", function() {
989992
equal( 0, $(e).filter(":filled").length );
990993
e.value = " ";
991994
equal( 0, $(e).filter(":filled").length );
992-
e.value = " "
995+
e.value = " ";
993996
equal( 0, $(e).filter(":filled").length );
994997
e.value= " a ";
995998
equal( 1, $(e).filter(":filled").length );

0 commit comments

Comments
 (0)