diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/datepicker/datepicker_options.js | 98 | ||||
| -rw-r--r-- | tests/unit/datepicker/datepicker_test_helpers.js | 16 |
2 files changed, 70 insertions, 44 deletions
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js index 93ffc8136..a5d66314c 100644 --- a/tests/unit/datepicker/datepicker_options.js +++ b/tests/unit/datepicker/datepicker_options.js @@ -88,38 +88,51 @@ test("change", function() { }); asyncTest( "invocation", function() { - expect( 29 ); var button, image, - inp = TestHelpers.datepicker.init( "#inp" ), - dp = $( "#ui-datepicker-div" ), + isOldIE = $.ui.ie && ( !document.documentMode || document.documentMode < 9 ), body = $( "body" ); - function step1() { - // On focus + expect( isOldIE ? 25 : 29 ); + + function step0() { + var input = $( "<input>" ).appendTo( "#qunit-fixture" ), + inp = TestHelpers.datepicker.init( input ), + dp = $( "#ui-datepicker-div" ); + button = inp.siblings( "button" ); ok( button.length === 0, "Focus - button absent" ); image = inp.siblings( "img" ); ok( image.length === 0, "Focus - image absent" ); - inp.one( "focus", function() { + TestHelpers.datepicker.onFocus( inp, function() { ok( dp.is( ":visible" ), "Focus - rendered on focus" ); inp.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } ); ok( !dp.is( ":visible" ), "Focus - hidden on exit" ); + step1(); + }); + } - TestHelpers.datepicker.onBlurThenFocus( inp, function() { - ok( dp.is( ":visible" ), "Focus - rendered on focus" ); - body.simulate( "mousedown", {} ); - ok( !dp.is( ":visible" ), "Focus - hidden on external click" ); - inp.datepicker( "hide" ).datepicker( "destroy" ); + function step1() { - step2(); - }); - }).simulate( "focus" ); + var input = $( "<input>" ).appendTo( "#qunit-fixture" ), + inp = TestHelpers.datepicker.init( input ), + dp = $( "#ui-datepicker-div" ); + + TestHelpers.datepicker.onFocus( inp, function() { + ok( dp.is( ":visible" ), "Focus - rendered on focus" ); + body.simulate( "mousedown", {} ); + ok( !dp.is( ":visible" ), "Focus - hidden on external click" ); + inp.datepicker( "hide" ).datepicker( "destroy" ); + + step2(); + }); } function step2() { - // On button - inp = TestHelpers.datepicker.init( "#inp", { showOn: "button", buttonText: "Popup" } ); + var input = $( "<input>" ).appendTo( "#qunit-fixture" ), + inp = TestHelpers.datepicker.init( input, { showOn: "button", buttonText: "Popup" } ), + dp = $( "#ui-datepicker-div" ); + ok( !dp.is( ":visible" ), "Button - initially hidden" ); button = inp.siblings( "button" ); image = inp.siblings( "img" ); @@ -127,7 +140,7 @@ asyncTest( "invocation", function() { ok( image.length === 0, "Button - image absent" ); equal( button.text(), "Popup", "Button - button text" ); - TestHelpers.datepicker.onBlurThenFocus( inp, function() { + TestHelpers.datepicker.onFocus( inp, function() { ok( !dp.is( ":visible" ), "Button - not rendered on focus" ); button.click(); ok( dp.is( ":visible" ), "Button - rendered on button click" ); @@ -140,13 +153,15 @@ asyncTest( "invocation", function() { } function step3() { - // On image button - inp = TestHelpers.datepicker.init( "#inp", { - showOn: "button", - buttonImageOnly: true, - buttonImage: "images/calendar.gif", - buttonText: "Cal" - }); + var input = $( "<input>" ).appendTo( "#qunit-fixture" ), + inp = TestHelpers.datepicker.init( input, { + showOn: "button", + buttonImageOnly: true, + buttonImage: "images/calendar.gif", + buttonText: "Cal" + }), + dp = $( "#ui-datepicker-div" ); + ok( !dp.is( ":visible" ), "Image button - initially hidden" ); button = inp.siblings( "button" ); ok( button.length === 0, "Image button - button absent" ); @@ -155,7 +170,7 @@ asyncTest( "invocation", function() { equal( image.attr( "src" ), "images/calendar.gif", "Image button - image source" ); equal( image.attr( "title" ), "Cal", "Image button - image text" ); - TestHelpers.datepicker.onBlurThenFocus( inp, function() { + TestHelpers.datepicker.onFocus( inp, function() { ok( !dp.is( ":visible" ), "Image button - not rendered on focus" ); image.click(); ok( dp.is( ":visible" ), "Image button - rendered on image click" ); @@ -168,8 +183,10 @@ asyncTest( "invocation", function() { } function step4() { - // On both - inp = TestHelpers.datepicker.init( "#inp", { showOn: "both", buttonImage: "images/calendar.gif"} ); + var input = $( "<input>" ).appendTo( "#qunit-fixture" ), + inp = TestHelpers.datepicker.init( input, { showOn: "both", buttonImage: "images/calendar.gif"} ), + dp = $( "#ui-datepicker-div" ); + ok( !dp.is( ":visible" ), "Both - initially hidden" ); button = inp.siblings( "button" ); ok( button.length === 1, "Both - button present" ); @@ -178,21 +195,26 @@ asyncTest( "invocation", function() { image = button.children( "img" ); ok( image.length === 1, "Both - button image present" ); - TestHelpers.datepicker.onBlurThenFocus( inp, function() { - ok( dp.is( ":visible" ), "Both - rendered on focus" ); - body.simulate( "mousedown", {} ); - ok( !dp.is( ":visible" ), "Both - hidden on external click" ); - button.click(); - ok( dp.is( ":visible" ), "Both - rendered on button click" ); - button.click(); - ok( !dp.is( ":visible" ), "Both - hidden on second button click" ); - inp.datepicker( "hide" ).datepicker( "destroy" ); + // TODO: occasionally this test flakily fails to focus in IE8 in browserstack + if ( !isOldIE ) { + TestHelpers.datepicker.onFocus( inp, function() { + ok( dp.is( ":visible" ), "Both - rendered on focus" ); + body.simulate( "mousedown", {} ); + ok( !dp.is( ":visible" ), "Both - hidden on external click" ); + button.click(); + ok( dp.is( ":visible" ), "Both - rendered on button click" ); + button.click(); + ok( !dp.is( ":visible" ), "Both - hidden on second button click" ); + inp.datepicker( "hide" ).datepicker( "destroy" ); + start(); + }); + } else { start(); - }); + } } - step1(); + step0(); }); test("otherMonths", function() { diff --git a/tests/unit/datepicker/datepicker_test_helpers.js b/tests/unit/datepicker/datepicker_test_helpers.js index 884735def..b683f5137 100644 --- a/tests/unit/datepicker/datepicker_test_helpers.js +++ b/tests/unit/datepicker/datepicker_test_helpers.js @@ -18,12 +18,16 @@ TestHelpers.datepicker = { $.datepicker.setDefaults($.datepicker.regional[""]); return $(id).datepicker($.extend({showAnim: ""}, options || {})); }, - onBlurThenFocus: function( element, callback ) { - element.one( "blur", function(){ - element.one( "focus", function(){ - callback(); - }).simulate( "focus" ); - }).simulate( "blur" ); + onFocus: function( element, onFocus ) { + var fn = function( event ){ + if( !event.originalEvent ) { + return; + } + element.unbind( "focus", fn ); + onFocus(); + }; + + element.bind( "focus", fn )[ 0 ].focus(); }, PROP_NAME: "datepicker" };
\ No newline at end of file |