From c1a0f2bf6c7155e73e373818c44b06dcbe18c847 Mon Sep 17 00:00:00 2001 From: Richard Worth Date: Tue, 15 Mar 2011 09:36:36 -0400 Subject: [PATCH] Autocomplete: refactored unit tests for autoFocus option --- .../unit/autocomplete/autocomplete_options.js | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/tests/unit/autocomplete/autocomplete_options.js b/tests/unit/autocomplete/autocomplete_options.js index 09cfb6b5f..be2f28391 100644 --- a/tests/unit/autocomplete/autocomplete_options.js +++ b/tests/unit/autocomplete/autocomplete_options.js @@ -97,32 +97,26 @@ test( "appendTo", function() { ac.autocomplete( "destroy" ); }); -test( "autoFocus: false", function() { +function autoFocusTest( afValue, focusedLength ) { var ac = $( "#autocomplete" ).autocomplete({ - autoFocus: false, + autoFocus: afValue, delay: 0, source: data, open: function( event, ui ) { - equals( 0, ac.autocomplete( "widget" ).children( ".ui-menu-item:first .ui-state-focus" ).length, "first item is not auto focused" ); + equals( focusedLength, ac.autocomplete( "widget" ).children( ".ui-menu-item:first .ui-state-focus" ).length, "first item is " + afValue ? "" : "not" + " auto focused" ); start(); } }); ac.val( "ja" ).keydown(); stop(); +} + +test( "autoFocus: false", function() { + autoFocusTest( false, 0 ); }); test( "autoFocus: true", function() { - var ac = $( "#autocomplete" ).autocomplete({ - autoFocus: true, - delay: 0, - source: data, - open: function( event, ui ) { - equals( 1, ac.autocomplete( "widget" ).children( ".ui-menu-item:first .ui-state-focus" ).length, "first item is auto focused" ); - start(); - } - }); - ac.val( "ja" ).keydown(); - stop(); + autoFocusTest( true, 1 ); }); test("delay", function() { -- 2.39.5