Skip to content

Commit f8990e6

Browse files
authored
Tests: Test only valid values for Datepicker defaultDate, min/maxDate
The docs say that valid periods when using string value and period pairs as relative dates are "y", "m", "w", and "d" https://api.jqueryui.com/datepicker/ Closes jquerygh-2143
1 parent 988b73d commit f8990e6

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

tests/unit/datepicker/options.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -303,49 +303,49 @@ QUnit.test( "defaultDate", function( assert ) {
303303
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
304304
date.setDate( date.getDate() - 1 );
305305
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date -1d" );
306-
inp.datepicker( "option", { defaultDate: "+3D" } ).
306+
inp.datepicker( "option", { defaultDate: "+3d" } ).
307307
datepicker( "hide" ).val( "" ).datepicker( "show" ).
308308
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
309309
date.setDate( date.getDate() + 4 );
310-
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +3D" );
310+
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +3d" );
311311
inp.datepicker( "option", { defaultDate: " -2 w " } ).
312312
datepicker( "hide" ).val( "" ).datepicker( "show" ).
313313
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
314314
date = new Date();
315315
date.setDate( date.getDate() - 14 );
316316
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date -2 w" );
317-
inp.datepicker( "option", { defaultDate: "+1 W" } ).
317+
inp.datepicker( "option", { defaultDate: "+1 w" } ).
318318
datepicker( "hide" ).val( "" ).datepicker( "show" ).
319319
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
320320
date.setDate( date.getDate() + 21 );
321-
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +1 W" );
321+
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +1 w" );
322322
inp.datepicker( "option", { defaultDate: " -1 m " } ).
323323
datepicker( "hide" ).val( "" ).datepicker( "show" ).
324324
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
325325
date = testHelper.addMonths( new Date(), -1 );
326326
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date -1 m" );
327-
inp.datepicker( "option", { defaultDate: "+2M" } ).
327+
inp.datepicker( "option", { defaultDate: "+2m" } ).
328328
datepicker( "hide" ).val( "" ).datepicker( "show" ).
329329
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
330330
date = testHelper.addMonths( new Date(), 2 );
331-
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +2M" );
331+
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +2m" );
332332
inp.datepicker( "option", { defaultDate: "-2y" } ).
333333
datepicker( "hide" ).val( "" ).datepicker( "show" ).
334334
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
335335
date = new Date();
336336
date.setFullYear( date.getFullYear() - 2 );
337337
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date -2y" );
338-
inp.datepicker( "option", { defaultDate: "+1 Y " } ).
338+
inp.datepicker( "option", { defaultDate: "+1 y " } ).
339339
datepicker( "hide" ).val( "" ).datepicker( "show" ).
340340
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
341341
date.setFullYear( date.getFullYear() + 3 );
342-
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +1 Y" );
343-
inp.datepicker( "option", { defaultDate: "+1M +10d" } ).
342+
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +1 y" );
343+
inp.datepicker( "option", { defaultDate: "+1m +10d" } ).
344344
datepicker( "hide" ).val( "" ).datepicker( "show" ).
345345
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
346346
date = testHelper.addMonths( new Date(), 1 );
347347
date.setDate( date.getDate() + 10 );
348-
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +1M +10d" );
348+
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date, "Default date +1m +10d" );
349349

350350
// String date values
351351
inp.datepicker( "option", { defaultDate: "07/04/2007" } ).
@@ -486,19 +486,19 @@ QUnit.test( "minMax", function( assert ) {
486486
// Relative dates
487487
date = new Date();
488488
date.setDate( date.getDate() - 7 );
489-
inp.datepicker( "option", { minDate: "-1w", maxDate: "+1 M +10 D " } ).
489+
inp.datepicker( "option", { minDate: "-1w", maxDate: "+1 m +10 d " } ).
490490
datepicker( "hide" ).val( "" ).datepicker( "show" );
491491
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP } ).
492492
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
493493
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date,
494-
"Min/max - -1w, +1 M +10 D - ctrl+pgup" );
494+
"Min/max - -1w, +1 m +10 d - ctrl+pgup" );
495495
date = testHelper.addMonths( new Date(), 1 );
496496
date.setDate( date.getDate() + 10 );
497497
inp.val( "" ).datepicker( "show" );
498498
inp.simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN } ).
499499
simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
500500
testHelper.equalsDate( assert, inp.datepicker( "getDate" ), date,
501-
"Min/max - -1w, +1 M +10 D - ctrl+pgdn" );
501+
"Min/max - -1w, +1 m +10 d - ctrl+pgdn" );
502502

503503
// With existing date
504504
inp = testHelper.init( "#inp" );
@@ -524,7 +524,7 @@ QUnit.test( "minMax", function( assert ) {
524524

525525
inp.val( "" ).datepicker( "option", {
526526
minDate: new Date( 1900, 0, 1 ),
527-
maxDate: "-7Y",
527+
maxDate: "-7y",
528528
yearRange: "1900:-7"
529529
} );
530530
assert.ok( dp.find( ".ui-datepicker-next" ).hasClass( "ui-state-disabled" ), "Year Range Test - relative - next button disabled" );

0 commit comments

Comments
 (0)