Skip to content

Commit 4db03f4

Browse files
tjvantollscottgonzalez
tjvantoll
authored and
scottgonzalez
committed
Datepicker: Re-adding mouse tests
1 parent 4d51220 commit 4db03f4

File tree

1 file changed

+70
-70
lines changed

1 file changed

+70
-70
lines changed

‎tests/unit/datepicker/datepicker_core.js

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -498,109 +498,109 @@ asyncTest( "keyboard handling", function() {
498498
*/
499499

500500
test( "mouse", function() {
501-
// TODO: These tests use the old getDate() and setDate() methods. Re-activate these
502-
// tests when those methods are available.
503-
expect( 0 );
504-
return;
505-
506-
expect( 15 );
507-
var inl,
508-
inp = TestHelpers.datepicker.init( "#datepicker" ),
509-
dp = inp.datepicker( "widget" ).find( ".ui-datepicker" ),
501+
expect( 13 );
502+
var input = $( "#datepicker" ).datepicker(),
503+
picker = input.datepicker( "widget" ),
504+
inline = $( "#inline" ).datepicker,
510505
date = new Date();
511506

512-
inp.val( "" ).datepicker( "open" );
513-
$( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
507+
input.val( "" ).datepicker( "open" );
508+
$( ".ui-datepicker-calendar tbody a:contains(10)", picker ).simulate( "mousedown", {} );
514509
date.setDate( 10 );
515-
TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click" );
510+
TestHelpers.datepicker.equalsDate( input.datepicker( "valueAsDate" ), date, "Mouse click" );
516511

517-
inp.val( "02/04/2008" ).datepicker( "open" );
518-
$( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
519-
TestHelpers.datepicker.equalsDate( inp.datepicker("getDate"), new Date( 2008, 2 - 1, 12 ),
512+
input.val( "2/4/08" ).datepicker( "open" );
513+
$( ".ui-datepicker-calendar tbody a:contains(12)", picker ).simulate( "mousedown", {} );
514+
TestHelpers.datepicker.equalsDate( input.datepicker("valueAsDate"), new Date( 2008, 2 - 1, 12 ),
520515
"Mouse click - preset") ;
521516

522-
inp.val( "02/04/2008" ).datepicker( "open" );
523-
inp.val( "").datepicker( "open" );
524-
$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
525-
ok( inp.datepicker( "getDate" ) == null, "Mouse click - close" );
526-
inp.val( "02/04/2008" ).datepicker( "open" );
527-
$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
528-
TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
517+
input.val( "" ).datepicker( "open" );
518+
$( "button.ui-datepicker-close", picker ).simulate( "click", {} );
519+
ok( input.datepicker( "valueAsDate" ) == null, "Mouse click - close" );
520+
521+
input.val( "2/4/08" ).datepicker( "open" );
522+
$( "button.ui-datepicker-close", picker ).simulate( "click", {} );
523+
TestHelpers.datepicker.equalsDate( input.datepicker( "valueAsDate" ), new Date( 2008, 2 - 1, 4 ),
529524
"Mouse click - close + preset" );
530525

531-
inp.val( "02/04/2008" ).datepicker( "open" );
532-
$( "a.ui-datepicker-prev", dp ).simulate( "click", {} );
533-
$( "button.ui-datepicker-close", dp ).simulate( "click", {} );
534-
TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
526+
input.val( "2/4/08" ).datepicker( "open" );
527+
$( "a.ui-datepicker-prev", picker ).simulate( "click", {} );
528+
$( "button.ui-datepicker-close", picker ).simulate( "click", {} );
529+
TestHelpers.datepicker.equalsDate( input.datepicker( "valueAsDate" ), new Date( 2008, 2 - 1, 4 ),
535530
"Mouse click - abandoned" );
536531

537532
// Current/previous/next
538-
inp.val( "02/04/2008" ).datepicker( "option", { showButtonPanel: true }).datepicker( "open" );
539-
$( ".ui-datepicker-current", dp ).simulate( "click", {} );
540-
$( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
541-
date.setDate( 14 );
542-
TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click - current" );
543-
544-
inp.val( "02/04/2008" ).datepicker( "open" );
545-
$( ".ui-datepicker-prev", dp ).simulate( "click" );
546-
$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
547-
TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
533+
input.val( "" ).datepicker( "open" );
534+
$( ".ui-datepicker-current", picker ).simulate( "click", {} );
535+
date.setDate( new Date().getDate() );
536+
TestHelpers.datepicker.equalsDate( input.datepicker( "valueAsDate" ), date, "Mouse click - current" );
537+
538+
input.val( "2/4/08" ).datepicker( "open" );
539+
$( ".ui-datepicker-prev", picker ).simulate( "click" );
540+
$( ".ui-datepicker-calendar tbody a:contains(16)", picker ).simulate( "mousedown" );
541+
TestHelpers.datepicker.equalsDate( input.datepicker( "valueAsDate" ), new Date( 2008, 1 - 1, 16 ),
548542
"Mouse click - previous" );
549543

550-
inp.val( "02/04/2008" ).datepicker( "open" );
551-
$(".ui-datepicker-next", dp ).simulate( "click" );
552-
$(".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
553-
TestHelpers.datepicker.equalsDate( inp.datepicker("getDate"), new Date( 2008, 3 - 1, 18 ),
544+
input.val( "2/4/08" ).datepicker( "open" );
545+
$(".ui-datepicker-next", picker ).simulate( "click" );
546+
$(".ui-datepicker-calendar tbody a:contains(18)", picker ).simulate( "mousedown" );
547+
TestHelpers.datepicker.equalsDate( input.datepicker("valueAsDate"), new Date( 2008, 3 - 1, 18 ),
554548
"Mouse click - next" );
555549

550+
/*
551+
// TODO: Re-add when min and max options are introduced.
556552
// Previous/next with minimum/maximum
557-
inp.datepicker("option", {
553+
input.datepicker("option", {
558554
minDate: new Date( 2008, 2 - 1, 2 ),
559555
maxDate: new Date( 2008, 2 - 1, 26 )
560-
}).val( "02/04/2008" ).datepicker( "open" );
561-
$( ".ui-datepicker-prev", dp ).simulate( "click" );
562-
$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
563-
TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 16 ),
556+
}).val( "2/4/08" ).datepicker( "open" );
557+
$( ".ui-datepicker-prev", picker ).simulate( "click" );
558+
$( ".ui-datepicker-calendar tbody a:contains(16)", picker ).simulate( "mousedown" );
559+
TestHelpers.datepicker.equalsDate( input.datepicker( "valueAsDate" ), new Date( 2008, 2 - 1, 16 ),
564560
"Mouse click - previous + min/max" );
565561
566-
inp.val( "02/04/2008" ).datepicker( "open" );
567-
$( ".ui-datepicker-next", dp ).simulate( "click" );
568-
$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
569-
TestHelpers.datepicker.equalsDate(inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 18 ),
562+
input.val( "2/4/08" ).datepicker( "open" );
563+
$( ".ui-datepicker-next", picker ).simulate( "click" );
564+
$( ".ui-datepicker-calendar tbody a:contains(18)", picker ).simulate( "mousedown" );
565+
TestHelpers.datepicker.equalsDate(input.datepicker( "valueAsDate" ), new Date( 2008, 2 - 1, 18 ),
570566
"Mouse click - next + min/max" );
567+
*/
571568

572569
// Inline
573-
inl = TestHelpers.datepicker.init( "#inline" );
574-
dp = $( ".ui-datepicker-inline", inl );
570+
inline = TestHelpers.datepicker.init( "#inline" );
571+
picker = $( ".ui-datepicker-inline", inline );
575572
date = new Date();
576-
inl.datepicker( "setDate", date );
577-
$( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
573+
inline.datepicker( "valueAsDate", date );
574+
$( ".ui-datepicker-calendar tbody a:contains(10)", picker ).simulate( "mousedown", {} );
578575
date.setDate( 10 );
579-
TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline" );
576+
TestHelpers.datepicker.equalsDate( inline.datepicker( "valueAsDate" ), date, "Mouse click inline" );
580577

581-
inl.datepicker( "option", { showButtonPanel: true })
582-
.datepicker( "setDate", new Date( 2008, 2 - 1, 4 ));
583-
$( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
584-
TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 2 - 1, 12 ),
578+
inline.datepicker( "option", { showButtonPanel: true })
579+
.datepicker( "valueAsDate", new Date( 2008, 2 - 1, 4 ));
580+
$( ".ui-datepicker-calendar tbody a:contains(12)", picker ).simulate( "mousedown", {} );
581+
TestHelpers.datepicker.equalsDate( inline.datepicker( "valueAsDate" ), new Date( 2008, 2 - 1, 12 ),
585582
"Mouse click inline - preset" );
586583

587-
inl.datepicker("option", { showButtonPanel: true });
588-
$( ".ui-datepicker-current", dp ).simulate( "click", {} );
589-
$( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
584+
inline.datepicker("option", { showButtonPanel: true });
585+
$( ".ui-datepicker-current", picker ).simulate( "click", {} );
586+
$( ".ui-datepicker-calendar tbody a:contains(14)", picker ).simulate( "mousedown", {} );
590587
date.setDate( 14 );
591-
TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline - current" );
588+
TestHelpers.datepicker.equalsDate( inline.datepicker( "valueAsDate" ), date, "Mouse click inline - current" );
592589

593-
inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4) );
594-
$( ".ui-datepicker-prev", dp ).simulate( "click" );
595-
$( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
596-
TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
590+
inline.datepicker( "valueAsDate", new Date( 2008, 2 - 1, 4) );
591+
$( ".ui-datepicker-prev", picker ).simulate( "click" );
592+
$( ".ui-datepicker-calendar tbody a:contains(16)", picker ).simulate( "mousedown" );
593+
TestHelpers.datepicker.equalsDate( inline.datepicker( "valueAsDate" ), new Date( 2008, 1 - 1, 16 ),
597594
"Mouse click inline - previous" );
598595

599-
inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4) );
600-
$( ".ui-datepicker-next", dp ).simulate( "click" );
601-
$( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
602-
TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 3 - 1, 18 ),
596+
inline.datepicker( "valueAsDate", new Date( 2008, 2 - 1, 4) );
597+
$( ".ui-datepicker-next", picker ).simulate( "click" );
598+
$( ".ui-datepicker-calendar tbody a:contains(18)", picker ).simulate( "mousedown" );
599+
TestHelpers.datepicker.equalsDate( inline.datepicker( "valueAsDate" ), new Date( 2008, 3 - 1, 18 ),
603600
"Mouse click inline - next" );
601+
602+
input.datepicker( "destroy" );
603+
inline.datepicker( "destroy" );
604604
});
605605

606606
})( jQuery );

0 commit comments

Comments
 (0)