Skip to content

Commit 666f051

Browse files
jzaeffererjzaefferer
committed
Tests: Reduce timeouts to optimize testsuite runtime
1 parent 19783fd commit 666f051

File tree

11 files changed

+68
-70
lines changed

11 files changed

+68
-70
lines changed

‎tests/unit/autocomplete/autocomplete_core.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ asyncTest( "past end of menu in multiline autocomplete", function() {
187187
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
188188
equal( element.text(), customVal );
189189
start();
190-
}, 50 );
190+
});
191191
});
192192

193193
asyncTest( "ESCAPE in multiline autocomplete", function() {
@@ -213,7 +213,7 @@ asyncTest( "ESCAPE in multiline autocomplete", function() {
213213
element.simulate( "keydown", { keyCode: $.ui.keyCode.ESCAPE } );
214214
equal( element.text(), customVal );
215215
start();
216-
}, 50 );
216+
});
217217
});
218218

219219
asyncTest( "handle race condition", function() {
@@ -226,8 +226,8 @@ asyncTest( "handle race condition", function() {
226226
equal( count, 1, "request with 1 character is first" );
227227
setTimeout(function() {
228228
response([ "one" ]);
229-
setTimeout( checkResults, 1 );
230-
}, 1 );
229+
setTimeout( checkResults );
230+
});
231231
return;
232232
}
233233
equal( count, 2, "request with 2 characters is second" );

‎tests/unit/autocomplete/autocomplete_events.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ $.each([
7171
// blur must be async for IE to handle it properly
7272
setTimeout(function() {
7373
element.simulate( "blur" );
74-
}, 1 );
75-
}, 50 );
74+
});
75+
});
7676
});
7777
});
7878

@@ -117,8 +117,8 @@ asyncTest( "cancel search", function() {
117117
ok( menu.is( ":visible" ), "menu is visible after second search" );
118118
equal( menu.find( ".ui-menu-item" ).length, 2, "# of menu items" );
119119
start();
120-
}, 50 );
121-
}, 50 );
120+
});
121+
});
122122
});
123123

124124
asyncTest( "cancel focus", function() {
@@ -137,7 +137,7 @@ asyncTest( "cancel focus", function() {
137137
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
138138
equal( element.val(), customVal );
139139
start();
140-
}, 50 );
140+
});
141141
});
142142

143143
asyncTest( "cancel select", function() {
@@ -157,7 +157,7 @@ asyncTest( "cancel select", function() {
157157
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
158158
equal( element.val(), customVal );
159159
start();
160-
}, 50 );
160+
});
161161
});
162162

163163
asyncTest( "blur during remote search", function() {
@@ -170,7 +170,7 @@ asyncTest( "blur during remote search", function() {
170170
setTimeout(function() {
171171
response([ "result" ]);
172172
start();
173-
}, 100 );
173+
}, 25);
174174
},
175175
open: function() {
176176
ok( false, "opened after a blur" );

‎tests/unit/autocomplete/autocomplete_options.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ asyncTest( "delay", function() {
102102
expect( 2 );
103103
var element = $( "#autocomplete" ).autocomplete({
104104
source: data,
105-
delay: 50
105+
delay: 25
106106
}),
107107
menu = element.autocomplete( "widget" );
108108
element.val( "ja" ).keydown();
@@ -112,7 +112,7 @@ asyncTest( "delay", function() {
112112
setTimeout(function() {
113113
ok( menu.is( ":visible" ), "menu is open after delay" );
114114
start();
115-
}, 100 );
115+
}, 50 );
116116
});
117117

118118
asyncTest( "disabled", function() {
@@ -133,7 +133,7 @@ asyncTest( "disabled", function() {
133133
setTimeout(function() {
134134
ok( menu.is( ":hidden" ) );
135135
start();
136-
}, 50 );
136+
});
137137
});
138138

139139
test( "minLength", function() {
@@ -158,7 +158,7 @@ asyncTest( "minLength, exceed then drop below", function() {
158158
equal( req.term, "12", "correct search term" );
159159
setTimeout(function() {
160160
res([ "item" ]);
161-
}, 1 );
161+
});
162162
}
163163
}),
164164
menu = element.autocomplete( "widget" );
@@ -172,7 +172,7 @@ asyncTest( "minLength, exceed then drop below", function() {
172172
setTimeout(function() {
173173
ok( menu.is( ":hidden" ), "menu is hidden after searches" );
174174
start();
175-
}, 50 );
175+
});
176176
});
177177

178178
test( "minLength, exceed then drop below then exceed", function() {

‎tests/unit/dialog/dialog_events.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ asyncTest("ensure dialog's container doesn't scroll on resize and focus", functi
337337
equal($(window).scrollTop(), initialScroll, "scroll hasn't moved after focus moved to dialog");
338338
element.dialog("destroy");
339339
start();
340-
}, 500);
340+
});
341341
});
342342

343343
test("#5184: isOpen in dialogclose event is true", function() {

‎tests/unit/dialog/dialog_methods.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ asyncTest("#9000: Dialog leaves broken event handler after close/destroy in cert
8787
$( "#favorite-animal" ).focus();
8888
ok( true, "close and destroy modal dialog before its really opened" );
8989
start();
90-
}, 2 );
90+
});
9191
});
9292

9393
test("#4980: Destroy should place element back in original DOM position", function(){

‎tests/unit/menu/menu_core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected
5454
element.menu( "focus", null, firstChild );
5555
wrapper.addClass( "ui-state-active" );
5656
setTimeout( function() {
57-
ok( wrapper.is( ".ui-state-active" ), "ui-state-active improperly removed" );
57+
ok( wrapper.is( ".ui-state-active" ) );
5858
start();
59-
}, 500 );
59+
});
6060
});
6161

6262
})( jQuery );

‎tests/unit/menu/menu_events.js

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -111,62 +111,66 @@ asyncTest( "handle focus of menu with active item", function() {
111111
});
112112
});
113113

114-
asyncTest( "handle submenu auto collapse: mouseleave", function() {
114+
asyncTest( "handle submenu auto collapse: mouseleave, default markup", function() {
115115
expect( 4 );
116+
$.ui.menu.prototype.delay = 1;
116117
var element = $( "#menu2" ).menu(),
117118
event = $.Event( "mouseenter" );
118119

119120
function menumouseleave1() {
120121
equal( element.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
121122
element.menu( "focus", event, element.find( "li:nth-child(7) li:first" ) );
122-
setTimeout( menumouseleave2, 350 );
123+
setTimeout( menumouseleave2, 25 );
123124
}
124125
function menumouseleave2() {
125126
equal( element.find( "ul[aria-expanded='true']" ).length, 2, "second submenu expanded" );
126127
element.find( "ul[aria-expanded='true']:first" ).trigger( "mouseleave" );
127-
setTimeout( menumouseleave3, 350 );
128+
setTimeout( menumouseleave3, 25 );
128129
}
129130
function menumouseleave3() {
130131
equal( element.find( "ul[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
131132
element.trigger( "mouseleave" );
132-
setTimeout( menumouseleave4, 350 );
133+
setTimeout( menumouseleave4, 25 );
133134
}
134135
function menumouseleave4() {
135136
equal( element.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
137+
$.ui.menu.prototype.delay = 300;
136138
start();
137139
}
138140

139141
element.find( "li:nth-child(7)" ).trigger( "mouseenter" );
140-
setTimeout( menumouseleave1, 350 );
142+
setTimeout( menumouseleave1, 25 );
141143
});
142144

143-
asyncTest( "handle submenu auto collapse: mouseleave", function() {
145+
asyncTest( "handle submenu auto collapse: mouseleave, custom markup", function() {
144146
expect( 4 );
147+
$.ui.menu.prototype.delay = 1;
145148
var element = $( "#menu5" ).menu({ menus: ".menu" }),
146149
event = $.Event( "mouseenter" );
147150

148151
function menumouseleave1() {
149152
equal( element.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
150153
element.menu( "focus", event, element.find( ":nth-child(7)" ).find( ".menu" ).eq( 0 ).children().eq( 0 ) );
151-
setTimeout( menumouseleave2, 350 );
154+
setTimeout( menumouseleave2, 25 );
152155
}
153156
function menumouseleave2() {
154157
equal( element.find( "div[aria-expanded='true']" ).length, 2, "second submenu expanded" );
155158
element.find( "div[aria-expanded='true']:first" ).trigger( "mouseleave" );
156-
setTimeout( menumouseleave3, 350 );
159+
setTimeout( menumouseleave3, 25 );
157160
}
158161
function menumouseleave3() {
159162
equal( element.find( "div[aria-expanded='true']" ).length, 1, "second submenu collapsed" );
160163
element.trigger( "mouseleave" );
161-
setTimeout( menumouseleave4, 350 );
164+
setTimeout( menumouseleave4, 25 );
162165
}
163166
function menumouseleave4() {
164167
equal( element.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
168+
$.ui.menu.prototype.delay = 300;
165169
start();
166170
}
167171

168172
element.find( ":nth-child(7)" ).trigger( "mouseenter" );
169-
setTimeout( menumouseleave1, 350 );
173+
setTimeout( menumouseleave1, 25 );
170174
});
171175

172176
asyncTest( "handle keyboard navigation on menu without scroll and without submenus", function() {
@@ -251,7 +255,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
251255
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
252256
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
253257
equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
254-
setTimeout( menukeyboard1, 50 );
258+
setTimeout( menukeyboard1 );
255259
});
256260
element.focus();
257261

@@ -274,8 +278,8 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
274278

275279
setTimeout(function() {
276280
equal( logOutput(), "keydown,1,2,3,4,0", "Keydown RIGHT (open submenu)" );
277-
setTimeout( menukeyboard2, 50 );
278-
}, 50 );
281+
setTimeout( menukeyboard2 );
282+
} );
279283
}
280284

281285
function menukeyboard2() {
@@ -285,7 +289,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
285289

286290
// re-open submenu
287291
element.simulate( "keydown", { keyCode: $.ui.keyCode.RIGHT } );
288-
setTimeout( menukeyboard3, 50 );
292+
setTimeout( menukeyboard3 );
289293
}
290294

291295
function menukeyboard3() {
@@ -319,7 +323,7 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
319323

320324
log( "keydown", true );
321325
element.simulate( "keydown", { keyCode: $.ui.keyCode.SPACE } );
322-
setTimeout( menukeyboard4, 50 );
326+
setTimeout( menukeyboard4 );
323327
}
324328

325329
function menukeyboard4() {
@@ -344,9 +348,9 @@ asyncTest( "handle keyboard navigation on menu without scroll and with submenus"
344348

345349
log( "keydown", true );
346350
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
347-
setTimeout( menukeyboard6, 50 );
348-
}, 50 );
349-
}, 50 );
351+
setTimeout( menukeyboard6 );
352+
} );
353+
} );
350354
}
351355

352356
function menukeyboard6() {
@@ -446,7 +450,7 @@ asyncTest( "handle keyboard navigation on menu with scroll and with submenus", f
446450
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
447451
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
448452
equal( logOutput(), "keydown,1,2", "Keydown DOWN" );
449-
setTimeout( menukeyboard1, 50 );
453+
setTimeout( menukeyboard1 );
450454
});
451455
element.focus();
452456

‎tests/unit/menu/menu_methods.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,13 @@ module( "menu: methods", {
1111
});
1212

1313
test( "destroy", function() {
14-
expect( 4 );
15-
domEqual( "#menu1", function() {
16-
$( "#menu1" ).menu().menu( "destroy" );
17-
});
14+
expect( 2 );
1815
domEqual( "#menu2", function() {
1916
$( "#menu2" ).menu().menu( "destroy" );
2017
});
2118
domEqual( "#menu5", function() {
2219
$( "#menu5").menu().menu( "destroy" );
2320
});
24-
domEqual( "#menu6", function() {
25-
$( "#menu6" ).menu().menu( "destroy" );
26-
});
2721
});
2822

2923
test( "enable/disable", function() {

0 commit comments

Comments
 (0)