Skip to content

Commit 0a5a909

Browse files
scottgonzalezscottgonzalez
committed
Tests: Lint.
1 parent 58a120b commit 0a5a909

File tree

11 files changed

+155
-147
lines changed

11 files changed

+155
-147
lines changed

‎grunt.js

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,27 +350,46 @@ grunt.initConfig({
350350
accordion_state: true,
351351
asyncTest: true,
352352
commonWidgetTests: true,
353+
container: true,
353354
deepEqual: true,
355+
d1: true,
356+
d2: true,
354357
dlg: true,
355358
domEqual: true,
356359
drag: true,
360+
dragged: true,
357361
el: true,
358362
equal: true,
359363
expect: true,
360364
Globalize: true,
365+
heightAfter: true,
366+
isNotOpen: true,
367+
isOpen: true,
361368
menu_click: true,
362369
menu_log: true,
370+
modal: true,
363371
module: true,
372+
moved: true,
364373
notEqual: true,
374+
offsetAfter: true,
375+
offsetBefore: true,
365376
ok: true,
366377
QUnit: true,
378+
restoreScroll: true,
379+
shouldBeDroppable: true,
380+
shouldmove: true,
381+
shouldNotBeDroppable: true,
382+
shouldnotmove: true,
383+
shouldnotresize: true,
384+
shouldresize: true,
367385
spinner_simulateKeyDownUp: true,
368386
start: true,
369387
strictEqual: true,
370388
stop: true,
371389
tabs_state: true,
372390
tabs_disabled: true,
373-
test: true
391+
test: true,
392+
widthAfter: true
374393
}
375394
}
376395
};

‎tests/unit/dialog/dialog_core.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ function drag(handle, dx, dy) {
4040

4141
function moved(dx, dy, msg) {
4242
msg = msg ? msg + "." : "";
43-
var actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) };
44-
var expected = { left: Math.round(offsetBefore.left + dx), top: Math.round(offsetBefore.top + dy) };
43+
var actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) },
44+
expected = { left: Math.round(offsetBefore.left + dx), top: Math.round(offsetBefore.top + dy) };
4545
deepEqual(actual, expected, 'dragged[' + dragged.dx + ', ' + dragged.dy + '] ' + msg);
4646
}
4747

@@ -59,8 +59,8 @@ function shouldnotmove(why) {
5959

6060
function resized(dw, dh, msg) {
6161
msg = msg ? msg + "." : "";
62-
var actual = { width: widthAfter, height: heightAfter };
63-
var expected = { width: widthBefore + dw, height: heightBefore + dh };
62+
var actual = { width: widthAfter, height: heightAfter },
63+
expected = { width: widthBefore + dw, height: heightBefore + dh };
6464
deepEqual(actual, expected, 'resized[' + dragged.dx + ', ' + dragged.dy + '] ' + msg);
6565
}
6666

‎tests/unit/dialog/dialog_events.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ test("dragStart", function() {
6363

6464
test("drag", function() {
6565
expect(9);
66-
var hasDragged = false;
66+
var handle,
67+
hasDragged = false;
6768

6869
el = $('<div></div>').dialog({
6970
drag: function(ev, ui) {
@@ -83,7 +84,7 @@ test("drag", function() {
8384
ok(ui.position !== undefined, "ui.position in callback");
8485
ok(ui.offset !== undefined, "ui.offset in callback");
8586
});
86-
var handle = $(".ui-dialog-titlebar", dlg());
87+
handle = $(".ui-dialog-titlebar", dlg());
8788
drag(handle, 50, 50);
8889
el.remove();
8990
});
@@ -138,7 +139,8 @@ test("resizeStart", function() {
138139

139140
test("resize", function() {
140141
expect(13);
141-
var hasResized = false;
142+
var handle,
143+
hasResized = false;
142144

143145
el = $('<div></div>').dialog({
144146
resize: function(ev, ui) {
@@ -162,7 +164,7 @@ test("resize", function() {
162164
ok(ui.position !== undefined, "ui.position in callback");
163165
ok(ui.size !== undefined, "ui.size in callback");
164166
});
165-
var handle = $(".ui-resizable-se", dlg());
167+
handle = $(".ui-resizable-se", dlg());
166168
drag(handle, 50, 50);
167169
el.remove();
168170
});

‎tests/unit/dialog/dialog_methods.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,17 @@ test("isOpen", function() {
9898
});
9999

100100
test("moveToTop", function() {
101-
var expected = $('<div></div>').dialog(),
101+
var d1, d2, dlg1, dlg2,
102+
expected = $('<div></div>').dialog(),
102103
actual = expected.dialog('moveToTop');
103104
equal(actual, expected, 'moveToTop is chainable');
104105

105-
var d1 = $('<div></div>').dialog(), dlg1 = d1.parents('.ui-dialog');
106+
d1 = $('<div></div>').dialog();
107+
dlg1 = d1.parents('.ui-dialog');
106108
d1.dialog('close');
107109
d1.dialog('open');
108-
var d2 = $('<div></div>').dialog(), dlg2 = d2.parents('.ui-dialog');
110+
d2 = $('<div></div>').dialog();
111+
dlg2 = d2.parents('.ui-dialog');
109112
d2.dialog('close');
110113
d2.dialog('open');
111114
ok(dlg1.css('zIndex') < dlg2.css('zIndex'), 'dialog 1 under dialog 2 before moveToTop method called');

‎tests/unit/dialog/dialog_options.js

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ test("autoOpen", function() {
2020
test("buttons", function() {
2121
expect(21);
2222

23-
var buttons = {
23+
var btn, i, newButtons,
24+
buttons = {
2425
"Ok": function(ev, ui) {
2526
ok(true, "button click fires callback");
2627
equal(this, el[0], "context of callback");
@@ -34,10 +35,10 @@ test("buttons", function() {
3435
};
3536

3637
el = $('<div></div>').dialog({ buttons: buttons });
37-
var btn = $("button", dlg());
38+
btn = $("button", dlg());
3839
equal(btn.length, 2, "number of buttons");
3940

40-
var i = 0;
41+
i = 0;
4142
$.each(buttons, function(key, val) {
4243
equal(btn.eq(i).text(), key, "text of button " + (i+1));
4344
i++;
@@ -48,7 +49,7 @@ test("buttons", function() {
4849

4950
btn.trigger("click");
5051

51-
var newButtons = {
52+
newButtons = {
5253
"Close": function(ev, ui) {
5354
ok(true, "button click fires callback");
5455
equal(this, el[0], "context of callback");
@@ -275,69 +276,68 @@ test("minWidth", function() {
275276
});
276277

277278
test("position, default center on window", function() {
278-
var el = $('<div></div>').dialog();
279-
var dialog = el.dialog('widget');
280-
var offset = dialog.offset();
279+
var el = $('<div></div>').dialog(),
280+
dialog = el.dialog('widget'),
281+
offset = dialog.offset();
281282
deepEqual(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft());
282283
deepEqual(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop());
283284
el.remove();
284285
});
285286

286287
test("position, top on window", function() {
287-
var el = $('<div></div>').dialog({ position: "top" });
288-
var dialog = el.dialog('widget');
289-
var offset = dialog.offset();
288+
var el = $('<div></div>').dialog({ position: "top" }),
289+
dialog = el.dialog('widget'),
290+
offset = dialog.offset();
290291
deepEqual(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft());
291292
deepEqual(offset.top, $(window).scrollTop());
292293
el.remove();
293294
});
294295

295296
test("position, left on window", function() {
296-
var el = $('<div></div>').dialog({ position: "left" });
297-
var dialog = el.dialog('widget');
298-
var offset = dialog.offset();
297+
var el = $('<div></div>').dialog({ position: "left" }),
298+
dialog = el.dialog('widget'),
299+
offset = dialog.offset();
299300
deepEqual(offset.left, 0);
300301
deepEqual(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop());
301302
el.remove();
302303
});
303304

304305
test("position, right bottom on window", function() {
305-
var el = $('<div></div>').dialog({ position: "right bottom" });
306-
var dialog = el.dialog('widget');
307-
var offset = dialog.offset();
306+
var el = $('<div></div>').dialog({ position: "right bottom" }),
307+
dialog = el.dialog('widget'),
308+
offset = dialog.offset();
308309
deepEqual(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft());
309310
deepEqual(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop());
310311
el.remove();
311312
});
312313

313314
test("position, right bottom on window w/array", function() {
314-
var el = $('<div></div>').dialog({ position: ["right", "bottom"] });
315-
var dialog = el.dialog('widget');
316-
var offset = dialog.offset();
315+
var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
316+
dialog = el.dialog('widget'),
317+
offset = dialog.offset();
317318
deepEqual(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft());
318319
deepEqual(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop());
319320
el.remove();
320321
});
321322

322323
test("position, offset from top left w/array", function() {
323-
var el = $('<div></div>').dialog({ position: [10, 10] });
324-
var dialog = el.dialog('widget');
325-
var offset = dialog.offset();
324+
var el = $('<div></div>').dialog({ position: [10, 10] }),
325+
dialog = el.dialog('widget'),
326+
offset = dialog.offset();
326327
deepEqual(offset.left, 10 + $(window).scrollLeft());
327328
deepEqual(offset.top, 10 + $(window).scrollTop());
328329
el.remove();
329330
});
330331

331332
test("position, right bottom at right bottom via ui.position args", function() {
332333
var el = $('<div></div>').dialog({
333-
position: {
334-
my: "right bottom",
335-
at: "right bottom"
336-
}
337-
});
338-
339-
var dialog = el.dialog('widget');
340-
var offset = dialog.offset();
334+
position: {
335+
my: "right bottom",
336+
at: "right bottom"
337+
}
338+
}),
339+
dialog = el.dialog('widget'),
340+
offset = dialog.offset();
341341

342342
deepEqual(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft());
343343
deepEqual(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop());
@@ -346,23 +346,23 @@ test("position, right bottom at right bottom via ui.position args", function() {
346346

347347
test("position, at another element", function() {
348348
var parent = $('<div></div>').css({
349-
position: 'absolute',
350-
top: 400,
351-
left: 600,
352-
height: 10,
353-
width: 10
354-
}).appendTo('body');
355-
356-
var el = $('<div></div>').dialog({
357-
position: {
358-
my: "left top",
359-
at: "left top",
360-
of: parent
361-
}
362-
});
349+
position: 'absolute',
350+
top: 400,
351+
left: 600,
352+
height: 10,
353+
width: 10
354+
}).appendTo('body'),
355+
356+
el = $('<div></div>').dialog({
357+
position: {
358+
my: "left top",
359+
at: "left top",
360+
of: parent
361+
}
362+
}),
363363

364-
var dialog = el.dialog('widget');
365-
var offset = dialog.offset();
364+
dialog = el.dialog('widget'),
365+
offset = dialog.offset();
366366

367367
deepEqual(offset.left, 600);
368368
deepEqual(offset.top, 400);
@@ -373,7 +373,7 @@ test("position, at another element", function() {
373373
of: parent
374374
});
375375

376-
var offset = dialog.offset();
376+
offset = dialog.offset();
377377

378378
deepEqual(offset.left, 610);
379379
deepEqual(offset.top, 410);

‎tests/unit/dialog/dialog_tickets.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ asyncTest( "#3123: Prevent tabbing out of modal dialogs", function() {
1212
inputs = el.find( "input" ),
1313
widget = el.dialog( "widget" );
1414

15-
inputs.eq( 1 ).focus();
16-
equal( document.activeElement, inputs[1], "Focus set on second input" );
17-
inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
18-
19-
setTimeout( checkTab, 2 );
20-
2115
function checkTab() {
2216
ok( $.contains( widget, document.activeElement ), "Tab key event moved focus within the modal" );
2317

@@ -32,22 +26,29 @@ asyncTest( "#3123: Prevent tabbing out of modal dialogs", function() {
3226
el.remove();
3327
start();
3428
}
29+
30+
inputs.eq( 1 ).focus();
31+
equal( document.activeElement, inputs[1], "Focus set on second input" );
32+
inputs.eq( 1 ).simulate( "keydown", { keyCode: $.ui.keyCode.TAB });
33+
34+
setTimeout( checkTab, 2 );
3535
});
3636

3737
test("#4826: setting resizable false toggles resizable on dialog", function() {
3838
expect(6);
39+
var i;
3940

4041
el = $('<div></div>').dialog({ resizable: false });
4142
shouldnotresize("[default]");
42-
for (var i=0; i<2; i++) {
43+
for (i=0; i<2; i++) {
4344
el.dialog('close').dialog('open');
4445
shouldnotresize('initialized with resizable false toggle ('+ (i+1) +')');
4546
}
4647
el.remove();
4748

4849
el = $('<div></div>').dialog({ resizable: true });
4950
shouldresize("[default]");
50-
for (var i=0; i<2; i++) {
51+
for (i=0; i<2; i++) {
5152
el.dialog('close').dialog('option', 'resizable', false).dialog('open');
5253
shouldnotresize('set option resizable false toggle ('+ (i+1) +')');
5354
}
@@ -108,7 +109,7 @@ test("#6137: dialog('open') causes form elements to reset on IE7", function() {
108109
test("#6645: Missing element not found check in overlay", function(){
109110
expect(2);
110111
d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
111-
d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove()}});
112+
d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
112113
equal($.ui.dialog.overlay.instances.length, 2, 'two overlays created');
113114
d2.dialog('close');
114115
equal($.ui.dialog.overlay.instances.length, 1, 'one overlay remains after closing the 2nd overlay');
@@ -119,7 +120,7 @@ test("#6966: Escape key closes all dialogs, not the top one", function(){
119120
expect(8);
120121
// test with close function removing dialog
121122
d1 = $('<div title="dialog 1">Dialog 1</div>').dialog({modal: true});
122-
d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove()}});
123+
d2 = $('<div title="dialog 2">Dialog 2</div>').dialog({modal: true, close: function(){ d2.remove(); }});
123124
ok(d1.dialog("isOpen"), 'first dialog is open');
124125
ok(d2.dialog("isOpen"), 'second dialog is open');
125126
d2.simulate("keydown", {keyCode: $.ui.keyCode.ESCAPE});

0 commit comments

Comments
 (0)