diff options
| -rw-r--r-- | Gruntfile.js | 10 | ||||
| -rw-r--r-- | tests/unit/dialog/dialog_events.js | 4 | ||||
| -rw-r--r-- | tests/unit/dialog/dialog_options.js | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index b6a4ca24b..f20008d4e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -171,10 +171,14 @@ grunt.initConfig({ }, qunit: { files: expandFiles( "tests/unit/**/*.html" ).filter(function( file ) { - // disabling everything that doesn't (quite) work with PhantomJS for now // TODO except for all|index|test, try to include more as we go - return !( /(all|index|test|dialog|tooltip)\.html$/ ).test( file ); - }) + return !( /(all|index|test)\.html$/ ).test( file ); + }), + options: { + page: { + viewportSize: { width: 700, height: 500 } + } + } }, jshint: { options: { diff --git a/tests/unit/dialog/dialog_events.js b/tests/unit/dialog/dialog_events.js index 1384500f6..2af9990a8 100644 --- a/tests/unit/dialog/dialog_events.js +++ b/tests/unit/dialog/dialog_events.js @@ -361,9 +361,9 @@ test("ensure dialog keeps focus when clicking modal overlay", function() { var element = $( "<div></div>" ).dialog({ modal: true }); - ok( $(":focus").closest(".ui-dialog").length, "focus is in dialog" ); + equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is in dialog" ); $(".ui-widget-overlay").simulate("mousedown"); - ok( $(":focus").closest(".ui-dialog").length, "focus is still in dialog" ); + equal( $( document.activeElement ).closest( ".ui-dialog" ).length, 1, "focus is still in dialog" ); element.remove(); }); diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index 66aeebde0..87f3553be 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -558,7 +558,7 @@ asyncTest( "#4421 - Focus lost from dialog which uses show-effect", function() { var element = $( "<div></div>" ).dialog({ show: "blind", focus: function() { - equal( element.dialog( "widget" ).find( ":focus" ).length, 1, "dialog maintains focus" ); + equal( element.dialog( "widget" ).find( document.activeElement ).length, 1, "dialog maintains focus" ); element.remove(); start(); } |