]> source.dussan.org Git - jquery-ui.git/commitdiff
Datepicker: Clean up tests
authorTJ VanToll <tj.vantoll@gmail.com>
Sat, 2 Nov 2013 13:54:05 +0000 (09:54 -0400)
committerScott González <scott.gonzalez@gmail.com>
Thu, 29 Jan 2015 22:47:47 +0000 (17:47 -0500)
tests/unit/datepicker/datepicker.html
tests/unit/datepicker/datepicker_core.js
tests/unit/datepicker/datepicker_events.js
tests/unit/datepicker/datepicker_methods.js
tests/unit/datepicker/datepicker_options.js
tests/unit/datepicker/datepicker_test_helpers.js

index 2b3feb9e3432214d6a6515642488f4f373b89265..31fd709efbe1573bbd506e6f943f0ce0ae96097c 100644 (file)
 <div id="qunit"></div>
 <div id="qunit-fixture">
 
-<div><input type="text" id="inp"><input type="text" id="alt"><div id="inl"></div></div>
-<p><input type="text" id="inp2"></p>
+
+<input type="text" id="datepicker">
+<input type="text" id="datepicker2">
+<div id="inline"></div>
 
 </div>
 </body>
index 7b9dd2b93920c1f7c90eede176100e312e1223a9..8795b5a7e898a639029787369f76f0c00932b465 100644 (file)
@@ -12,38 +12,27 @@ module( "datepicker: core", {
 
 TestHelpers.testJshint( "datepicker" );
 
-test( "widget method - empty collection", function() {
-       expect( 1 );
-       $( "#nonExist" ).datepicker(); // should create nothing
-       ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" );
-});
-
-test("widget method", function() {
-       expect( 1 );
-       var actual = $("#inp").datepicker().datepicker("widget")[0];
-       deepEqual($("body > #ui-datepicker-div:last-child")[0], actual);
-});
-
 asyncTest( "baseStructure", function() {
-       expect( 58 );
+       expect( 42 );
        var header, title, table, thead, week, panel, inl, child,
                inp = TestHelpers.datepicker.initNewInput(),
-               dp = $( "#ui-datepicker-div" );
+               dp = inp.datepicker( "widget" ).find( ".ui-datepicker" );
 
        function step1() {
-               TestHelpers.datepicker.onFocus( inp, function() {
+               inp.focus();
+               setTimeout(function() {
                        ok( dp.is( ":visible" ), "Structure - datepicker visible" );
                        ok( !dp.is( ".ui-datepicker-rtl" ), "Structure - not right-to-left" );
                        ok( !dp.is( ".ui-datepicker-multi" ), "Structure - not multi-month" );
-                       equal( dp.children().length, 2, "Structure - child count" );
+                       equal( dp.children().length, 3, "Structure - child count (header, calendar, buttonpane)" );
 
                        header = dp.children( ":first" );
                        ok( header.is( "div.ui-datepicker-header" ), "Structure - header division" );
                        equal( header.children().length, 3, "Structure - header child count" );
-                       ok( header.children( ":first" ).is( "a.ui-datepicker-prev" ) && header.children( ":first" ).html() !== "", "Structure - prev link" );
-                       ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-next" ) && header.children( ":eq(1)" ).html() !== "", "Structure - next link" );
+                       ok( header.children( ":first" ).is( ".ui-datepicker-prev" ) && header.children( ":first" ).html() !== "", "Structure - prev link" );
+                       ok( header.children( ":eq(1)" ).is( ".ui-datepicker-next" ) && header.children( ":eq(1)" ).html() !== "", "Structure - next link" );
 
-                       title = header.children( ":last" );
+                       title = header.children( ":last" ).children( ":first" );
                        ok( title.is( "div.ui-datepicker-title" ) && title.html() !== "","Structure - title division" );
                        equal( title.children().length, 2, "Structure - title child count" );
                        ok( title.children( ":first" ).is( "span.ui-datepicker-month" ) && title.children( ":first" ).text() !== "", "Structure - month text" );
@@ -62,10 +51,11 @@ asyncTest( "baseStructure", function() {
                        week = table.children( ":eq(1)" ).children( ":first" );
                        ok( week.is( "tr" ), "Structure - month table week row" );
                        equal( week.children().length, 7, "Structure - week child count" );
-                       ok( week.children( ":first" ).is( "td.ui-datepicker-week-end" ), "Structure - month table first day cell" );
-                       ok( week.children( ":last" ).is( "td.ui-datepicker-week-end" ), "Structure - month table second day cell" );
+                       // TODO: Preserve these class names or let the user use :first-child and :last-child?
+                       // ok( week.children( ":first" ).is( "td.ui-datepicker-week-end" ), "Structure - month table first day cell" );
+                       // ok( week.children( ":last" ).is( "td.ui-datepicker-week-end" ), "Structure - month table second day cell" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
+                       inp.datepicker( "close" ).datepicker( "destroy" );
                        step2();
                });
        }
@@ -77,10 +67,13 @@ asyncTest( "baseStructure", function() {
                        changeYear: true,
                        showButtonPanel: true
                });
-               TestHelpers.datepicker.onFocus( inp, function() {
+               dp = inp.datepicker( "widget" ).find( ".ui-datepicker" );
+               inp.focus();
+               setTimeout(function() {
                        title = dp.find( "div.ui-datepicker-title" );
-                       ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure - month selector" );
-                       ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure - year selector" );
+                       // TODO: Re-add tests when changeMonth and changeYear are re-implemented
+                       //ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure - month selector" );
+                       //ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure - year selector" );
 
                        panel = dp.children( ":last" );
                        ok( panel.is( "div.ui-datepicker-buttonpane" ), "Structure - button panel division" );
@@ -88,7 +81,7 @@ asyncTest( "baseStructure", function() {
                        ok( panel.children( ":first" ).is( "button.ui-datepicker-current" ), "Structure - today button" );
                        ok( panel.children( ":last" ).is( "button.ui-datepicker-close" ), "Structure - close button" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
+                       inp.datepicker( "close" ).datepicker( "destroy" );
                        step3();
                });
        }
@@ -96,21 +89,25 @@ asyncTest( "baseStructure", function() {
        function step3() {
                // Multi-month 2
                inp = TestHelpers.datepicker.initNewInput({ numberOfMonths: 2 });
-               TestHelpers.datepicker.onFocus( inp, function() {
+               dp = inp.datepicker( "widget" ).find( ".ui-datepicker" );
+               inp.focus();
+               setTimeout(function() {
                        ok( dp.is( ".ui-datepicker-multi" ), "Structure multi [2] - multi-month" );
-                       equal( dp.children().length, 3, "Structure multi [2] - child count" );
+                       equal( dp.children().length, 4, "Structure multi [2] - child count" );
 
                        child = dp.children( ":first" );
-                       ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2] - first month division" );
+                       // TODO: Implement ui-datepicker-group-first class name
+                       // ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure multi [2] - first month division" );
 
                        child = dp.children( ":eq(1)" );
-                       ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2] - second month division" );
+                       // TODO: Implement ui-datepicker-group-last class name
+                       // ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure multi [2] - second month division" );
 
                        child = dp.children( ":eq(2)" );
                        ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2] - row break" );
                        ok( dp.is( ".ui-datepicker-multi-2" ), "Structure multi [2] - multi-2" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
+                       inp.datepicker( "close" ).datepicker( "destroy" );
                        step4();
                });
        }
@@ -118,11 +115,13 @@ asyncTest( "baseStructure", function() {
        function step4() {
                // Multi-month 3
                inp = TestHelpers.datepicker.initNewInput({ numberOfMonths: 3 });
-               TestHelpers.datepicker.onFocus( inp, function() {
+               dp = inp.datepicker( "widget" ).find( ".ui-datepicker" );
+               inp.focus();
+               setTimeout(function() {
                        ok( dp.is( ".ui-datepicker-multi-3" ), "Structure multi [3] - multi-3" );
                        ok( !dp.is( ".ui-datepicker-multi-2" ), "Structure multi [3] - Trac #6704" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
+                       inp.datepicker( "close" ).datepicker( "destroy" );
                        step5();
                });
        }
@@ -130,7 +129,11 @@ asyncTest( "baseStructure", function() {
        function step5() {
                // Multi-month [2, 2]
                inp = TestHelpers.datepicker.initNewInput({ numberOfMonths: [ 2, 2 ] });
-               TestHelpers.datepicker.onFocus( inp, function() {
+               dp = inp.datepicker( "widget" ).find( ".ui-datepicker" );
+               inp.focus();
+               setTimeout(function() {
+                       /*
+                       TODO: Re-add after array form of the numberOfMonths option is implemented.
                        ok( dp.is( ".ui-datepicker-multi" ), "Structure multi - multi-month" );
                        equal( dp.children().length, 6, "Structure multi [2,2] - child count" );
 
@@ -151,368 +154,335 @@ asyncTest( "baseStructure", function() {
 
                        child = dp.children( ":eq(5)" );
                        ok( child.is( "div.ui-datepicker-row-break" ), "Structure multi [2,2] - row break" );
-
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
-
-                       // Inline
-                       inl = TestHelpers.datepicker.init( "#inl" );
-                       dp = inl.children();
-
-                       ok( dp.is( ".ui-datepicker-inline" ), "Structure inline - main div" );
-                       ok( !dp.is( ".ui-datepicker-rtl" ), "Structure inline - not right-to-left" );
-                       ok( !dp.is( ".ui-datepicker-multi" ), "Structure inline - not multi-month" );
-                       equal( dp.children().length, 2, "Structure inline - child count" );
-
-                       header = dp.children( ":first" );
-                       ok( header.is( "div.ui-datepicker-header" ), "Structure inline - header division" );
-                       equal( header.children().length, 3, "Structure inline - header child count" );
-
-                       table = dp.children( ":eq(1)" );
-                       ok( table.is( "table.ui-datepicker-calendar" ), "Structure inline - month table" );
-                       ok( table.children( ":first" ).is( "thead" ), "Structure inline - month table thead" );
-                       ok( table.children( ":eq(1)" ).is( "tbody" ), "Structure inline - month table body" );
-
-                       inl.datepicker( "destroy" );
-
-                       // Inline multi-month
-                       inl = TestHelpers.datepicker.init( "#inl", { numberOfMonths: 2 } );
-                       dp = inl.children();
-
-                       ok( dp.is( ".ui-datepicker-inline" ) && dp.is( ".ui-datepicker-multi" ), "Structure inline multi - main div" );
-                       equal( dp.children().length, 3, "Structure inline multi - child count" );
-
-                       child = dp.children( ":first" );
-                       ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure inline multi - first month division" );
-
-                       child = dp.children( ":eq(1)" );
-                       ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure inline multi - second month division" );
-
-                       child = dp.children( ":eq(2)" );
-                       ok( child.is( "div.ui-datepicker-row-break" ), "Structure inline multi - row break" );
-
-                       inl.datepicker( "destroy" );
-                       start();
+                       */
+                       inp.datepicker( "close" ).datepicker( "destroy" );
+                       step6();
                });
        }
 
-       step1();
-});
+       function step6() {
+               // Inline
+               inl = TestHelpers.datepicker.init( "#inline" );
+               dp = inl.children();
 
-asyncTest( "customStructure", function() {
-       expect( 20 );
-       var header, panel, title, thead,
-               inp = TestHelpers.datepicker.initNewInput( $.datepicker.regional.he ),
-               dp = $( "#ui-datepicker-div" );
+               ok( dp.is( ".ui-datepicker-inline" ), "Structure inline - main div" );
+               ok( !dp.is( ".ui-datepicker-rtl" ), "Structure inline - not right-to-left" );
+               ok( !dp.is( ".ui-datepicker-multi" ), "Structure inline - not multi-month" );
+               equal( dp.children().length, 3, "Structure inline - child count (header, calendar, buttonpane)" );
 
-       function step1() {
-               inp.datepicker( "option", "showButtonPanel", true );
+               header = dp.children( ":first" );
+               ok( header.is( "div.ui-datepicker-header" ), "Structure inline - header division" );
+               equal( header.children().length, 3, "Structure inline - header child count" );
 
-               TestHelpers.datepicker.onFocus( inp, function() {
-                       ok( dp.is( ".ui-datepicker-rtl" ), "Structure RTL - right-to-left" );
+               table = dp.children( ":eq(1)" );
+               ok( table.is( "table.ui-datepicker-calendar" ), "Structure inline - month table" );
+               ok( table.children( ":first" ).is( "thead" ), "Structure inline - month table thead" );
+               ok( table.children( ":eq(1)" ).is( "tbody" ), "Structure inline - month table body" );
 
-                       header = dp.children( ":first" );
-                       ok( header.is( "div.ui-datepicker-header" ), "Structure RTL - header division" );
-                       equal( header.children().length, 3, "Structure RTL - header child count" );
-                       ok( header.children( ":first" ).is( "a.ui-datepicker-next" ), "Structure RTL - prev link" );
-                       ok( header.children( ":eq(1)" ).is( "a.ui-datepicker-prev" ), "Structure RTL - next link" );
+               inl.datepicker( "destroy" );
 
-                       panel = dp.children( ":last" );
-                       ok( panel.is( "div.ui-datepicker-buttonpane" ), "Structure RTL - button division" );
-                       equal( panel.children().length, 2, "Structure RTL - button panel child count" );
-                       ok( panel.children( ":first" ).is( "button.ui-datepicker-close" ), "Structure RTL - close button" );
-                       ok( panel.children( ":last" ).is( "button.ui-datepicker-current" ), "Structure RTL - today button" );
+               // TODO: Calling destroy() on inline pickers currently does not work.
+               inl.empty();
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
-                       step2();
-               });
+               step7();
        }
 
-       // Hide prev/next
-       function step2() {
-               inp = TestHelpers.datepicker.initNewInput({
-                       hideIfNoPrevNext: true,
-                       minDate: new Date( 2008, 2 - 1, 4 ),
-                       maxDate: new Date( 2008, 2 - 1, 14 )
-               });
-               inp.val( "02/10/2008" );
+       function step7() {
+               // Inline multi-month
+               inl = TestHelpers.datepicker.init( "#inline", { numberOfMonths: 2 } );
+               dp = inl.datepicker( "widget" ).find( ".ui-datepicker" );
 
-               TestHelpers.datepicker.onFocus( inp, function() {
-                       header = dp.children( ":first" );
-                       ok( header.is( "div.ui-datepicker-header" ), "Structure hide prev/next - header division" );
-                       equal( header.children().length, 1, "Structure hide prev/next - links child count" );
-                       ok( header.children( ":first" ).is( "div.ui-datepicker-title" ), "Structure hide prev/next - title division" );
+               ok( dp.is( ".ui-datepicker-inline" ) && dp.is( ".ui-datepicker-multi" ), "Structure inline multi - main div" );
+               equal( dp.children().length, 4, "Structure inline multi - child count" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
-                       step3();
-               });
-       }
+               child = dp.children( ":first" );
+               // TODO: Implement ui-datepicker-group-first class name
+               // ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-first" ), "Structure inline multi - first month division" );
 
-       // Changeable Month with read-only year
-       function step3() {
-               inp = TestHelpers.datepicker.initNewInput({ changeMonth: true });
+               child = dp.children( ":eq(1)" );
+               // TODO: Implement ui-datepicker-group-last class name
+               // ok( child.is( "div.ui-datepicker-group" ) && child.is( "div.ui-datepicker-group-last" ), "Structure inline multi - second month division" );
 
-               TestHelpers.datepicker.onFocus( inp, function() {
-                       title = dp.children( ":first" ).children( ":last" );
-                       equal( title.children().length, 2, "Structure changeable month - title child count" );
-                       ok( title.children( ":first" ).is( "select.ui-datepicker-month" ), "Structure changeable month - month selector" );
-                       ok( title.children( ":last" ).is( "span.ui-datepicker-year" ), "Structure changeable month - read-only year" );
+               child = dp.children( ":eq(2)" );
+               ok( child.is( "div.ui-datepicker-row-break" ), "Structure inline multi - row break" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
-                       step4();
-               });
+               inl.datepicker( "destroy" );
+               start();
        }
 
-       // Changeable year with read-only month
-       function step4() {
-               inp = TestHelpers.datepicker.initNewInput({ changeYear: true });
+       step1();
+});
 
-               TestHelpers.datepicker.onFocus( inp, function() {
-                       title = dp.children( ":first" ).children( ":last" );
-                       equal( title.children().length, 2, "Structure changeable year - title child count" );
-                       ok( title.children( ":first" ).is( "span.ui-datepicker-month" ), "Structure changeable year - read-only month" );
-                       ok( title.children( ":last" ).is( "select.ui-datepicker-year" ), "Structure changeable year - year selector" );
+test( "Keyboard handling", function() {
+       // TODO: These tests all rely on having a method to retrieve a Date object. There
+       // is not only implemented yet so bail.
+       expect( 0 );
+       return;
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
-                       step5();
-               });
-       }
+       expect( 24 );
+       var inp = TestHelpers.datepicker.init( "#datepicker" ),
+               date = new Date();
 
-       // Read-only first day of week
-       function step5() {
-               inp = TestHelpers.datepicker.initNewInput({ changeFirstDay: false });
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.val(), date, "Keystroke enter" );
 
-               TestHelpers.datepicker.onFocus( inp, function() {
-                       thead = dp.find( ".ui-datepicker-calendar thead tr" );
-                       equal( thead.children().length, 7, "Structure read-only first day - thead child count" );
-                       equal( thead.find( "a" ).length, 0, "Structure read-only first day - thead links count" );
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate("keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+               "Keystroke enter - preset" );
 
-                       inp.datepicker( "hide" ).datepicker( "destroy" );
-                       start();
-               });
-       }
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate(inp.datepicker( "getDate" ), date, "Keystroke ctrl+home" );
 
-       // TODO: figure out why this setTimeout is needed in IE,
-       // it only is necessary when the previous baseStructure tests runs first
-       // Support: IE
-       setTimeout( step1 );
-});
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.END });
+       ok( inp.datepicker( "getDate" ) == null, "Keystroke ctrl+end" );
 
-test("keystrokes", function() {
-       expect( 26 );
-       var inp = TestHelpers.datepicker.init("#inp"),
-               date = new Date();
-       inp.val("").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke enter");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-               "Keystroke enter - preset");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+home");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.END});
-       ok(inp.datepicker("getDate") == null, "Keystroke ctrl+end");
-       inp.val("").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE });
        ok(inp.datepicker("getDate") == null, "Keystroke esc");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-               "Keystroke esc - preset");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-               "Keystroke esc - abandoned");
+
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+               "Keystroke esc - preset" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date(2008, 2 - 1, 4),
+               "Keystroke esc - abandoned" );
+
        // Moving by day or week
-       inp.val("").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.LEFT}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       date.setDate(date.getDate() - 1);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+left");
-       inp.val("").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.LEFT}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       date.setDate(date.getDate() + 1);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke left");
-       inp.val("").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.RIGHT}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.LEFT })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       date.setDate( date.getDate() - 1 );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+left" );
+
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", {keyCode: $.ui.keyCode.LEFT }).
+               simulate( "keydown", {keyCode: $.ui.keyCode.ENTER });
+       date.setDate( date.getDate() + 1 );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke left") ;
+       
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", {ctrlKey: true, keyCode: $.ui.keyCode.RIGHT}).
+               simulate( "keydown", {keyCode: $.ui.keyCode.ENTER});
        date.setDate(date.getDate() + 1);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+right");
-       inp.val("").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.RIGHT}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+right" );
+       
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", {keyCode: $.ui.keyCode.RIGHT}).
+               simulate( "keydown", {keyCode: $.ui.keyCode.ENTER});
        date.setDate(date.getDate() - 1);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke right");
-       inp.val("").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke right" );
+       
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", {ctrlKey: true, keyCode: $.ui.keyCode.UP}).
+               simulate( "keydown", {keyCode: $.ui.keyCode.ENTER});
        date.setDate(date.getDate() - 7);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+up");
-       inp.val("").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+up" );
+       
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", {keyCode: $.ui.keyCode.UP}).
+               simulate( "keydown", {keyCode: $.ui.keyCode.ENTER});
        date.setDate(date.getDate() + 7);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke up");
-       inp.val("").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke up" );
+       
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", {ctrlKey: true, keyCode: $.ui.keyCode.DOWN}).
+               simulate( "keydown", {keyCode: $.ui.keyCode.ENTER});
        date.setDate(date.getDate() + 7);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke ctrl+down");
-       inp.val("").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       date.setDate(date.getDate() - 7);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Keystroke down");
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke ctrl+down" );
+       
+       inp.val( "" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.DOWN })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       date.setDate( date.getDate() - 7 );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Keystroke down" );
+
        // Moving by month or year
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 4),
-               "Keystroke pgup");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 4),
-               "Keystroke pgdn");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 4),
-               "Keystroke ctrl+pgup");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 4),
-               "Keystroke ctrl+pgdn");
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 4 ),
+               "Keystroke pgup" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 3 - 1, 4 ),
+               "Keystroke pgdn" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 2 - 1, 4 ),
+               "Keystroke ctrl+pgup" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER});
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2009, 2 - 1, 4 ),
+               "Keystroke ctrl+pgdn" );
+
        // Check for moving to short months
-       inp.val("03/31/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-               "Keystroke pgup - Feb");
-       inp.val("01/30/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 29),
-               "Keystroke pgdn - Feb");
-       inp.val("02/29/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2007, 2 - 1, 28),
-               "Keystroke ctrl+pgup - Feb");
-       inp.val("02/29/2008").datepicker("show").
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2009, 2 - 1, 28),
-               "Keystroke ctrl+pgdn - Feb");
+       inp.val( "03/31/2008" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_UP })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 29 ),
+               "Keystroke pgup - Feb" );
+
+       inp.val( "01/30/2008" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 29 ),
+               "Keystroke pgdn - Feb" );
+
+       inp.val( "02/29/2008" ).datepicker( "open" )
+               .simulate( "keydown", {ctrlKey: true, keyCode: $.ui.keyCode.PAGE_UP })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 2 - 1, 28 ),
+               "Keystroke ctrl+pgup - Feb" );
+
+       inp.val( "02/29/2008" ).datepicker( "open" )
+               .simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.PAGE_DOWN })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2009, 2 - 1, 28 ),
+               "Keystroke ctrl+pgdn - Feb" );
+
        // Goto current
-       inp.datepicker("option", {gotoCurrent: true}).
-               datepicker("hide").val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-               simulate("keydown", {ctrlKey: true, keyCode: $.ui.keyCode.HOME}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-               "Keystroke ctrl+home");
+       inp.datepicker( "option", { gotoCurrent: true })
+               .datepicker( "close" ).val( "02/04/2008" ).datepicker( "open" )
+               .late( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN })
+               .simulate( "keydown", { ctrlKey: true, keyCode: $.ui.keyCode.HOME })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+               "Keystroke ctrl+home" );
+
        // Change steps
-       inp.datepicker("option", {stepMonths: 2, gotoCurrent: false}).
-               datepicker("hide").val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_UP}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2007, 12 - 1, 4),
-               "Keystroke pgup step 2");
-       inp.val("02/04/2008").datepicker("show").
-               simulate("keydown", {keyCode: $.ui.keyCode.PAGE_DOWN}).
-               simulate("keydown", {keyCode: $.ui.keyCode.ENTER});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 4 - 1, 4),
-               "Keystroke pgdn step 2");
+       inp.datepicker( "option", { stepMonths: 2, gotoCurrent: false })
+               .datepicker( "close" ).val( "02/04/2008" ).datepicker( "open" )
+               .late( "keydown", { keyCode: $.ui.keyCode.PAGE_UP })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2007, 12 - 1, 4 ),
+               "Keystroke pgup step 2" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" )
+               .simulate( "keydown", { keyCode: $.ui.keyCode.PAGE_DOWN })
+               .simulate( "keydown", { keyCode: $.ui.keyCode.ENTER });
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 4 - 1, 4 ),
+               "Keystroke pgdn step 2" );
 });
 
-test("mouse", function() {
+test( "mouse", function() {
+       // TODO: These tests use the old getDate() and setDate() methods. Re-activate these
+       // tests when those methods are available.
+       expect( 0 );
+       return;
+
        expect( 15 );
        var inl,
-               inp = TestHelpers.datepicker.init("#inp"),
-               dp = $("#ui-datepicker-div"),
+               inp = TestHelpers.datepicker.init( "#datepicker" ),
+               dp = inp.datepicker( "widget" ).find( ".ui-datepicker" ),
                date = new Date();
-       inp.val("").datepicker("show");
-       $(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-       date.setDate(10);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Mouse click");
-       inp.val("02/04/2008").datepicker("show");
-       $(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 12),
-               "Mouse click - preset");
-       inp.val("02/04/2008").datepicker("show");
-       inp.val("").datepicker("show");
-       $("button.ui-datepicker-close", dp).simulate("click", {});
-       ok(inp.datepicker("getDate") == null, "Mouse click - close");
-       inp.val("02/04/2008").datepicker("show");
-       $("button.ui-datepicker-close", dp).simulate("click", {});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-               "Mouse click - close + preset");
-       inp.val("02/04/2008").datepicker("show");
-       $("a.ui-datepicker-prev", dp).simulate("click", {});
-       $("button.ui-datepicker-close", dp).simulate("click", {});
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 4),
-               "Mouse click - abandoned");
+
+       inp.val(  "" ).datepicker( "open"  );
+       $( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
+       date.setDate( 10 );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click" );
+
+       inp.val(  "02/04/2008"  ).datepicker( "open" );
+       $( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
+       TestHelpers.datepicker.equalsDate( inp.datepicker("getDate"), new Date( 2008, 2 - 1, 12 ),
+               "Mouse click - preset") ;
+
+       inp.val( "02/04/2008" ).datepicker( "open" );
+       inp.val( "").datepicker( "open" );
+       $( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+       ok( inp.datepicker( "getDate" ) == null, "Mouse click - close" );
+       inp.val( "02/04/2008" ).datepicker( "open" );
+       $( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+               "Mouse click - close + preset" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" );
+       $( "a.ui-datepicker-prev", dp ).simulate( "click", {} );
+       $( "button.ui-datepicker-close", dp ).simulate( "click", {} );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 4 ),
+               "Mouse click - abandoned" );
+
        // Current/previous/next
-       inp.val("02/04/2008").datepicker("option", {showButtonPanel: true}).datepicker("show");
-       $(".ui-datepicker-current", dp).simulate("click", {});
-       $(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-       date.setDate(14);
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), date, "Mouse click - current");
-       inp.val("02/04/2008").datepicker("show");
-       $(".ui-datepicker-prev", dp).simulate("click");
-       $(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-               "Mouse click - previous");
-       inp.val("02/04/2008").datepicker("show");
-       $(".ui-datepicker-next", dp).simulate("click");
-       $(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-               "Mouse click - next");
+       inp.val( "02/04/2008" ).datepicker( "option", { showButtonPanel: true }).datepicker( "open" );
+       $( ".ui-datepicker-current", dp ).simulate( "click", {} );
+       $( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
+       date.setDate( 14 );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), date, "Mouse click - current" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" );
+       $( ".ui-datepicker-prev", dp ).simulate( "click" );
+       $( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
+               "Mouse click - previous" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" );
+       $(".ui-datepicker-next", dp ).simulate( "click" );
+       $(".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+       TestHelpers.datepicker.equalsDate( inp.datepicker("getDate"), new Date( 2008, 3 - 1, 18 ),
+               "Mouse click - next" );
+
        // Previous/next with minimum/maximum
-       inp.datepicker("option", {minDate: new Date(2008, 2 - 1, 2),
-               maxDate: new Date(2008, 2 - 1, 26)}).val("02/04/2008").datepicker("show");
-       $(".ui-datepicker-prev", dp).simulate("click");
-       $(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 16),
-               "Mouse click - previous + min/max");
-       inp.val("02/04/2008").datepicker("show");
-       $(".ui-datepicker-next", dp).simulate("click");
-       $(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-       TestHelpers.datepicker.equalsDate(inp.datepicker("getDate"), new Date(2008, 2 - 1, 18),
-               "Mouse click - next + min/max");
+       inp.datepicker("option", {
+               minDate: new Date( 2008, 2 - 1, 2 ),
+               maxDate: new Date( 2008, 2 - 1, 26 )
+       }).val( "02/04/2008" ).datepicker( "open" );
+       $( ".ui-datepicker-prev", dp ).simulate( "click" );
+       $( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+       TestHelpers.datepicker.equalsDate( inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 16 ),
+               "Mouse click - previous + min/max" );
+
+       inp.val( "02/04/2008" ).datepicker( "open" );
+       $( ".ui-datepicker-next", dp ).simulate( "click" );
+       $( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+       TestHelpers.datepicker.equalsDate(inp.datepicker( "getDate" ), new Date( 2008, 2 - 1, 18 ),
+               "Mouse click - next + min/max" );
+
        // Inline
-       inl = TestHelpers.datepicker.init("#inl");
-       dp = $(".ui-datepicker-inline", inl);
+       inl = TestHelpers.datepicker.init( "#inline" );
+       dp = $( ".ui-datepicker-inline", inl );
        date = new Date();
-       inl.datepicker("setDate", date);
-       $(".ui-datepicker-calendar tbody a:contains(10)", dp).simulate("click", {});
-       date.setDate(10);
-       TestHelpers.datepicker.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline");
-       inl.datepicker("option", {showButtonPanel: true}).datepicker("setDate", new Date(2008, 2 - 1, 4));
-       $(".ui-datepicker-calendar tbody a:contains(12)", dp).simulate("click", {});
-       TestHelpers.datepicker.equalsDate(inl.datepicker("getDate"), new Date(2008, 2 - 1, 12), "Mouse click inline - preset");
-       inl.datepicker("option", {showButtonPanel: true});
-       $(".ui-datepicker-current", dp).simulate("click", {});
-       $(".ui-datepicker-calendar tbody a:contains(14)", dp).simulate("click", {});
-       date.setDate(14);
-       TestHelpers.datepicker.equalsDate(inl.datepicker("getDate"), date, "Mouse click inline - current");
-       inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-       $(".ui-datepicker-prev", dp).simulate("click");
-       $(".ui-datepicker-calendar tbody a:contains(16)", dp).simulate("click");
-       TestHelpers.datepicker.equalsDate(inl.datepicker("getDate"), new Date(2008, 1 - 1, 16),
-               "Mouse click inline - previous");
-       inl.datepicker("setDate", new Date(2008, 2 - 1, 4));
-       $(".ui-datepicker-next", dp).simulate("click");
-       $(".ui-datepicker-calendar tbody a:contains(18)", dp).simulate("click");
-       TestHelpers.datepicker.equalsDate(inl.datepicker("getDate"), new Date(2008, 3 - 1, 18),
-               "Mouse click inline - next");
+       inl.datepicker( "setDate", date );
+       $( ".ui-datepicker-calendar tbody a:contains(10)", dp ).simulate( "click", {} );
+       date.setDate( 10 );
+       TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline" );
+
+       inl.datepicker( "option", { showButtonPanel: true })
+               .datepicker( "setDate", new Date( 2008, 2 - 1, 4 ));
+       $( ".ui-datepicker-calendar tbody a:contains(12)", dp ).simulate( "click", {} );
+       TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 2 - 1, 12 ),
+               "Mouse click inline - preset" );
+
+       inl.datepicker("option", { showButtonPanel: true });
+       $( ".ui-datepicker-current", dp ).simulate( "click", {} );
+       $( ".ui-datepicker-calendar tbody a:contains(14)", dp ).simulate( "click", {} );
+       date.setDate( 14 );
+       TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), date, "Mouse click inline - current" );
+
+       inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4) );
+       $( ".ui-datepicker-prev", dp ).simulate( "click" );
+       $( ".ui-datepicker-calendar tbody a:contains(16)", dp ).simulate( "click" );
+       TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 1 - 1, 16 ),
+               "Mouse click inline - previous" );
+
+       inl.datepicker( "setDate", new Date( 2008, 2 - 1, 4) );
+       $( ".ui-datepicker-next", dp ).simulate( "click" );
+       $( ".ui-datepicker-calendar tbody a:contains(18)", dp ).simulate( "click" );
+       TestHelpers.datepicker.equalsDate( inl.datepicker( "getDate" ), new Date( 2008, 3 - 1, 18 ),
+               "Mouse click inline - next" );
 });
 
 })(jQuery);
index dfc42ccf9116695eeff26f8179a46b984a46a4e7..63e2b0e9cc777c092e754306033a24498b37dfc0 100644 (file)
@@ -1,10 +1,29 @@
-/*
- * datepicker_events.js
- */
-(function($) {
+(function( $ ) {
+
+module( "datepicker: events" );
+
+test( "beforeOpen", function() {
+       expect( 0 );
+});
+
+test( "close", function() {
+       expect( 0 );
+});
 
-module("datepicker: events");
+test( "open", function() {
+       expect( 0 );
+});
+
+test( "select", function() {
+       expect( 0 );
+});
 
+// The implement of events is completely changing therefore these tests are no longer directly
+// relevant. Leaving them around commented out so we can ensure the functionality is replicated.
+// For example:
+// TODO: In the old implementation the Enter key select's today's date when the <input> has
+// focus and is empty. Do we want to replicate this behavior in the rewrite?
+/*
 var selectedThis = null,
 selectedDate = null,
 selectedInst = null;
@@ -125,29 +144,6 @@ test("events", function() {
        inp.datepicker("show");
        equal(selectedThis, inp2[0], "Callback close this");
 });
+*/
 
-test("beforeShowDay-getDate", function() {
-       expect( 3 );
-       var inp = TestHelpers.datepicker.init("#inp", {beforeShowDay: function() { inp.datepicker("getDate"); return [true, ""]; }}),
-               dp = $("#ui-datepicker-div");
-       inp.val("01/01/2010").datepicker("show");
-       // contains non-breaking space
-       equal($("div.ui-datepicker-title").text(),
-               // support: IE <9, jQuery <1.8
-               // In IE7/8 with jQuery <1.8, encoded spaces behave in strange ways
-               $( "<span>January&#xa0;2010</span>" ).text(), "Initial month");
-       $("a.ui-datepicker-next", dp).click();
-       $("a.ui-datepicker-next", dp).click();
-       // contains non-breaking space
-       equal($("div.ui-datepicker-title").text(),
-               $( "<span>March&#xa0;2010</span>" ).text(), "After next clicks");
-       inp.datepicker("hide").datepicker("show");
-       $("a.ui-datepicker-prev", dp).click();
-       $("a.ui-datepicker-prev", dp).click();
-       // contains non-breaking space
-       equal($("div.ui-datepicker-title").text(),
-               $( "<span>November&#xa0;2009</span>" ).text(), "After prev clicks");
-       inp.datepicker("hide");
-});
-
-})(jQuery);
+})( jQuery );
index e52e126d2e692ae3bc9b7c355abea0045e95dbf5..e00f886444e1ecabf9966afb9678cac3c888e799 100644 (file)
-/*
- * datepicker_methods.js
- */
-(function($) {
+(function( $ ) {
 
-module("datepicker: methods");
+module( "datepicker: methods" );
 
-test("destroy", function() {
-       expect( 33 );
+test( "destroy", function() {
+       expect( 9 );
        var inl,
-               inp = TestHelpers.datepicker.init("#inp");
-       ok(inp.is(".hasDatepicker"), "Default - marker class set");
-       ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Default - instance present");
-       ok(inp.next().is("#alt"), "Default - button absent");
-       inp.datepicker("destroy");
-       inp = $("#inp");
-       ok(!inp.is(".hasDatepicker"), "Default - marker class cleared");
-       ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Default - instance absent");
-       ok(inp.next().is("#alt"), "Default - button absent");
-       // With button
-       inp= TestHelpers.datepicker.init("#inp", {showOn: "both"});
-       ok(inp.is(".hasDatepicker"), "Button - marker class set");
-       ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Button - instance present");
-       ok(inp.next().text() === "...", "Button - button added");
-       inp.datepicker("destroy");
-       inp = $("#inp");
-       ok(!inp.is(".hasDatepicker"), "Button - marker class cleared");
-       ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Button - instance absent");
-       ok(inp.next().is("#alt"), "Button - button removed");
-       // With append text
-       inp = TestHelpers.datepicker.init("#inp", {appendText: "Testing"});
-       ok(inp.is(".hasDatepicker"), "Append - marker class set");
-       ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Append - instance present");
-       ok(inp.next().text() === "Testing", "Append - append text added");
-       inp.datepicker("destroy");
-       inp = $("#inp");
-       ok(!inp.is(".hasDatepicker"), "Append - marker class cleared");
-       ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Append - instance absent");
-       ok(inp.next().is("#alt"), "Append - append text removed");
-       // With both
-       inp= TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImageOnly: true,
-               buttonImage: "images/calendar.gif", appendText: "Testing"});
-       ok(inp.is(".hasDatepicker"), "Both - marker class set");
-       ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Both - instance present");
-       ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
-       ok(inp.next().next().text() === "Testing", "Both - append text added");
-       inp.datepicker("destroy");
-       inp = $("#inp");
-       ok(!inp.is(".hasDatepicker"), "Both - marker class cleared");
-       ok(!$.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Both - instance absent");
-       ok(inp.next().is("#alt"), "Both - button and append text absent");
-       // Inline
-       inl = TestHelpers.datepicker.init("#inl");
-       ok(inl.is(".hasDatepicker"), "Inline - marker class set");
-       ok(inl.html() !== "", "Inline - datepicker present");
-       ok($.data(inl[0], TestHelpers.datepicker.PROP_NAME), "Inline - instance present");
-       ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
-       inl.datepicker("destroy");
-       inl = $("#inl");
-       ok(!inl.is(".hasDatepicker"), "Inline - marker class cleared");
-       ok(inl.html() === "", "Inline - datepicker absent");
-       ok(!$.data(inl[0], TestHelpers.datepicker.PROP_NAME), "Inline - instance absent");
-       ok(inl.next().length === 0 || inl.next().is("p"), "Inline - button absent");
+               inp = TestHelpers.datepicker.init( "#datepicker" );
+
+       ok( inp.datepicker( "instance" ), "instance created" );
+       ok( inp.attr( "aria-owns" ), "aria-owns attribute added" );
+       ok( inp.attr( "aria-haspopup" ), "aria-haspopup attribute added" );
+       inp.datepicker( "destroy" );
+       ok( !inp.datepicker( "instance" ), "instance removed" );
+       ok( !inp.attr( "aria-owns" ), "aria-owns attribute removed" );
+       ok( !inp.attr( "aria-haspopup" ), "aria-haspopup attribute removed" );
+
+       inl = TestHelpers.datepicker.init( "#inline" );
+       ok( inl.datepicker( "instance" ), "instance created" );
+       ok( inl.children().length > 0, "inline datepicker has children" );
+       inl.datepicker( "destroy" );
+       ok( !inl.datepicker( "instance" ), "instance removed" );
+       // TODO: Destroying inline datepickers currently does not work.
+       // ok( inl.children().length === 0, "inline picker no longer has children" );
 });
 
-test("enableDisable", function() {
-       expect( 33 );
-       var inl, dp,
-               inp = TestHelpers.datepicker.init("#inp");
-       ok(!inp.datepicker("isDisabled"), "Enable/disable - initially marked as enabled");
-       ok(!inp[0].disabled, "Enable/disable - field initially enabled");
-       inp.datepicker("disable");
-       ok(inp.datepicker("isDisabled"), "Enable/disable - now marked as disabled");
-       ok(inp[0].disabled, "Enable/disable - field now disabled");
-       inp.datepicker("enable");
-       ok(!inp.datepicker("isDisabled"), "Enable/disable - now marked as enabled");
-       ok(!inp[0].disabled, "Enable/disable - field now enabled");
-       inp.datepicker("destroy");
-       // With a button
-       inp = TestHelpers.datepicker.init("#inp", {showOn: "button"});
-       ok(!inp.datepicker("isDisabled"), "Enable/disable button - initially marked as enabled");
-       ok(!inp[0].disabled, "Enable/disable button - field initially enabled");
-       ok(!inp.next("button")[0].disabled, "Enable/disable button - button initially enabled");
-       inp.datepicker("disable");
-       ok(inp.datepicker("isDisabled"), "Enable/disable button - now marked as disabled");
-       ok(inp[0].disabled, "Enable/disable button - field now disabled");
-       ok(inp.next("button")[0].disabled, "Enable/disable button - button now disabled");
-       inp.datepicker("enable");
-       ok(!inp.datepicker("isDisabled"), "Enable/disable button - now marked as enabled");
-       ok(!inp[0].disabled, "Enable/disable button - field now enabled");
-       ok(!inp.next("button")[0].disabled, "Enable/disable button - button now enabled");
-       inp.datepicker("destroy");
-       // With an image button
-       inp = TestHelpers.datepicker.init("#inp", {showOn: "button", buttonImageOnly: true,
-               buttonImage: "images/calendar.gif"});
-       ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
-       ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
-       ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
-       inp.datepicker("disable");
-       ok(inp.datepicker("isDisabled"), "Enable/disable image - now marked as disabled");
-       ok(inp[0].disabled, "Enable/disable image - field now disabled");
-       ok(parseFloat(inp.next("img").css("opacity")) !== 1, "Enable/disable image - image now disabled");
-       inp.datepicker("enable");
-       ok(!inp.datepicker("isDisabled"), "Enable/disable image - now marked as enabled");
-       ok(!inp[0].disabled, "Enable/disable image - field now enabled");
-       ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image now enabled");
-       inp.datepicker("destroy");
+test( "enable / disable", function() {
+       expect( 6 );
+       var inl,
+               inp = TestHelpers.datepicker.init( "#datepicker" ),
+               dp = inp.datepicker( "widget" );
+
+       ok( !inp.datepicker( "option", "disabled" ), "initially enabled" );
+       ok( !dp.hasClass( "ui-datepicker-disabled" ), "does not have disabled class name" );
+
+       inp.datepicker( "disable" );
+       ok( inp.datepicker( "option", "disabled" ), "disabled option is set" );
+       ok( dp.hasClass( "ui-datepicker-disabled" ), "datepicker has disabled class name" );
+
+       inp.datepicker( "enable" );
+       ok( !inp.datepicker( "option", "disabled" ), "enabled after enable() call" );
+       ok( !dp.hasClass( "ui-datepicker-disabled" ), "no longer has disabled class name" );
+
        // Inline
-       inl = TestHelpers.datepicker.init("#inl", {changeYear: true});
-       dp = $(".ui-datepicker-inline", inl);
-       ok(!inl.datepicker("isDisabled"), "Enable/disable inline - initially marked as enabled");
-       ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visually disabled initially");
-       ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled initially");
-       inl.datepicker("disable");
-       ok(inl.datepicker("isDisabled"), "Enable/disable inline - now marked as disabled");
-       ok(dp.children().is(".ui-state-disabled"), "Enable/disable inline - visually disabled");
-       ok(dp.find("select").prop("disabled"), "Enable/disable inline - form element disabled");
-       inl.datepicker("enable");
-       ok(!inl.datepicker("isDisabled"), "Enable/disable inline - now marked as enabled");
-       ok(!dp.children().is(".ui-state-disabled"), "Enable/disable inline - not visiually disabled");
-       ok(!dp.find("select").prop("disabled"), "Enable/disable inline - form element enabled");
-       inl.datepicker("destroy");
+       inl = TestHelpers.datepicker.init( "#inline" );
+       dp = inl.datepicker( "instance" );
+
+       // TODO: Disabling inline pickers does not work.
+       // TODO: When changeMonth and changeYear options are implemented ensure their dropdowns
+       // are properly disabled when in an inline picker.
+});
+
+test( "widget", function() {
+       expect( 1 );
+       var actual = $( "#datepicker" ).datepicker().datepicker( "widget" );
+       deepEqual( $("body > .ui-front" )[ 0 ],  actual[ 0 ] );
+       actual.remove();
+});
+
+test( "close", function() {
+       expect( 0 );
+});
+
+test( "open", function() {
+       expect( 0 );
+});
+
+test( "value", function() {
+       expect( 0 );
 });
 
-})(jQuery);
+})( jQuery );
index 08c31f5ad4a9c14a0d874cd1d6eb5e2a11d4b1ad..fedfe7dd5ed3381ed60bf29dff17ae288094be94 100644 (file)
@@ -1,11 +1,28 @@
-/*
- * datepicker_options.js
- */
+(function( $ ) {
+
+module( "datepicker: options" );
+
+test( "dateFormat", function() {
+       expect( 0 );
+});
 
-(function($) {
+test( "eachDay", function() {
+       expect( 0 );
+});
 
-module("datepicker: options");
+test( "numberOfMonths", function() {
+       expect( 0 );
+});
 
+test( "position", function() {
+       expect( 0 );
+});
+
+test( "showWeek", function() {
+       expect( 0 );
+});
+
+/*
 test("setDefaults", function() {
        expect( 3 );
        TestHelpers.datepicker.init("#inp");
@@ -1120,5 +1137,6 @@ test( "Ticket 7602: Stop datepicker from appearing with beforeShow event handler
        equal( dp.css( "display" ), "none","beforeShow returns false" );
        inp.datepicker( "destroy" );
 });
+*/
 
 })(jQuery);
index 82610393bec13fb475d8c1108f5c01c6b2283fe2..e99014fc0495bcd6ce563557bf69caa071c3cf45 100644 (file)
@@ -15,12 +15,13 @@ TestHelpers.datepicker = {
                equal(d1.toString(), d2.toString(), message);
        },
        init: function( id, options ) {
-               $.datepicker.setDefaults( $.datepicker.regional[ "" ] );
-               return $( id ).datepicker( $.extend( { showAnim: "" }, options || {} ) );
+               options = $.extend( { show: false }, options || {} );
+               return $( id ).datepicker( options );
        },
        initNewInput: function( options ) {
-               var id = $( "<input>" ).appendTo( "#qunit-fixture" );
-               return TestHelpers.datepicker.init( id, options );
+               options = $.extend( { show: false }, options || {} );
+               return $( "<input>" ).datepicker( options )
+                       .appendTo( "#qunit-fixture" );
        },
        onFocus: TestHelpers.onFocus,
        PROP_NAME: "datepicker"