Skip to content

Commit aa187f5

Browse files
scottgonzalezscottgonzalez
committed
Tests: Lint
1 parent 4f19289 commit aa187f5

File tree

7 files changed

+114
-118
lines changed

7 files changed

+114
-118
lines changed

‎grunt.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ grunt.initConfig({
361361
menu_click: true,
362362
menu_log: true,
363363
module: true,
364+
notEqual: true,
364365
ok: true,
365366
QUnit: true,
366367
spinner_simulateKeyDownUp: true,

‎tests/unit/effects/effects_core.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ asyncTest( "animateClass clears style properties when stopped", function() {
9999
var test = $("div.animateClass"),
100100
style = test[0].style,
101101
orig = style.cssText;
102-
102+
103103
expect( 2 );
104104

105105
test.addClass( "testChangeBackground", duration );
@@ -113,17 +113,17 @@ asyncTest( "animateClass clears style properties when stopped", function() {
113113
asyncTest( "animateClass: css and class changes during animation are not lost (#7106)", function() {
114114
var test = $( "div.ticket7106" );
115115

116-
// add a class and change a style property after starting an animated class
117-
test.addClass( "animate", minDuration, animationComplete )
118-
.addClass( "testClass" )
119-
.height( 100 );
120-
121116
// ensure the class stays and that the css property stays
122117
function animationComplete() {
123118
ok( test.hasClass( "testClass" ), "class change during animateClass was not lost" );
124119
equal( test.height(), 100, "css change during animateClass was not lost" );
125120
start();
126121
}
122+
123+
// add a class and change a style property after starting an animated class
124+
test.addClass( "animate", minDuration, animationComplete )
125+
.addClass( "testClass" )
126+
.height( 100 );
127127
});
128128

129129

@@ -133,10 +133,9 @@ $.each( $.effects.effect, function( effect ) {
133133
}
134134
module( "effect."+effect );
135135
asyncTest( "show/hide", function() {
136-
var hidden = $( "div.hidden" );
137136
expect( 8 );
138-
139-
var count = 0,
137+
var hidden = $( "div.hidden" ),
138+
count = 0,
140139
test = 0;
141140

142141
function queueTest( fn ) {

‎tests/unit/effects/effects_scale.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ module( "effect.scale: Scale" );
44
function run( position, v, h, vo, ho ) {
55
var desc = "End Position Correct: " + position + " (" + v + "," + h + ") - origin: (" + vo + "," + ho + ")";
66
asyncTest( desc, function() {
7+
function complete() {
8+
equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
9+
equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
10+
start();
11+
}
712
var test = $( ".testScale" ),
813
css = {
914
position: position
@@ -21,22 +26,16 @@ function run( position, v, h, vo, ho ) {
2126

2227
css[ h ] = 33;
2328
css[ v ] = 33;
24-
target[ h ] = h === ho ? css[ h ] : ho == "center" ? css[ h ] - 35 : css[ h ] - 70;
25-
target[ v ] = v === vo ? css[ v ] : vo == "middle" ? css[ v ] - 35 : css[ v ] - 70;
26-
if ( relative && h == "right" ) {
29+
target[ h ] = h === ho ? css[ h ] : ho === "center" ? css[ h ] - 35 : css[ h ] - 70;
30+
target[ v ] = v === vo ? css[ v ] : vo === "middle" ? css[ v ] - 35 : css[ v ] - 70;
31+
if ( relative && h === "right" ) {
2732
target[ h ] += 70;
2833
}
29-
if ( relative && v == "bottom" ) {
34+
if ( relative && v === "bottom" ) {
3035
target[ v ] += 70;
3136
}
3237
test.css( css );
3338
test.effect( effect );
34-
35-
function complete() {
36-
equal( parseInt( test.css( h ), 10 ), target[ h ], "Horizontal Position Correct " + desc );
37-
equal( parseInt( test.css( v ), 10 ), target[ v ], "Vertical Position Correct " + desc );
38-
start();
39-
}
4039
});
4140
}
4241

‎tests/unit/menu/menu_core.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@ module("menu: core");
99

1010
test("accessibility", function () {
1111
expect(5);
12-
var menu = $('#menu1').menu();
13-
var item0 = $("li:eq(0) a");
12+
var item,
13+
menu = $('#menu1').menu(),
14+
item0 = $("li:eq(0) a");
1415

1516
ok( menu.hasClass("ui-menu ui-widget ui-widget-content ui-corner-all"), "menu class");
1617
equal( menu.attr("role"), "menu", "main role");
1718
ok( !menu.attr("aria-activedescendant"), "aria attribute not yet active");
1819

19-
var item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
20+
item = menu.find( "li:first" ).find( "a" ).attr( "id", "xid" ).end();
2021
menu.menu( "focus", $.Event(), item );
2122
equal( menu.attr("aria-activedescendant"), "xid", "aria attribute, id from dom");
2223

23-
var item = menu.find( "li:last" );
24+
item = menu.find( "li:last" );
2425
menu.menu( "focus", $.Event(), item );
2526
equal( menu.attr("aria-activedescendant"), "menu1-4", "aria attribute, generated id");
2627
});

‎tests/unit/menu/menu_events.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
8686
expect( 4 );
8787
var $menu = $( "#menu2" ).menu();
8888

89-
$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
90-
setTimeout( menumouseleave1, 350 );
91-
9289
function menumouseleave1() {
9390
equal( $menu.find( "ul[aria-expanded='true']" ).length, 1, "first submenu expanded" );
9491
$menu.find( "li:nth-child(7) li:first" ).trigger( "mouseover" );
@@ -108,15 +105,15 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
108105
equal( $menu.find( "ul[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
109106
start();
110107
}
108+
109+
$menu.find( "li:nth-child(7)" ).trigger( "mouseover" );
110+
setTimeout( menumouseleave1, 350 );
111111
});
112112

113113
asyncTest( "handle submenu auto collapse: mouseleave", function() {
114114
expect( 4 );
115115
var $menu = $( "#menu5" ).menu( { menus: "div" } );
116116

117-
$menu.find( ":nth-child(7)" ).trigger( "mouseover" );
118-
setTimeout( menumouseleave1, 350 );
119-
120117
function menumouseleave1() {
121118
equal( $menu.find( "div[aria-expanded='true']" ).length, 1, "first submenu expanded" );
122119
$menu.find( ":nth-child(7)" ).find( "div" ).eq( 0 ).children().eq( 0 ).trigger( "mouseover" );
@@ -136,6 +133,10 @@ asyncTest( "handle submenu auto collapse: mouseleave", function() {
136133
equal( $menu.find( "div[aria-expanded='true']" ).length, 0, "first submenu collapsed" );
137134
start();
138135
}
136+
137+
$menu.find( ":nth-child(7)" ).trigger( "mouseover" );
138+
setTimeout( menumouseleave1, 350 );
139+
139140
});
140141

141142

‎tests/unit/position/position_core.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,31 +42,32 @@ test( "my, at, of", function() {
4242
});
4343

4444
test( "multiple elements", function() {
45-
var elements = $( "#el1, #el2" );
46-
var result = elements.position({
47-
my: "left top",
48-
at: "left bottom",
49-
of: "#parent",
50-
collision: "none"
51-
});
45+
var elements = $( "#el1, #el2" ),
46+
result = elements.position({
47+
my: "left top",
48+
at: "left bottom",
49+
of: "#parent",
50+
collision: "none"
51+
}),
52+
expected = { top: 10, left: 4 };
5253

5354
deepEqual( result, elements );
54-
var expected = { top: 10, left: 4 };
5555
elements.each(function() {
5656
deepEqual( $( this ).offset(), expected );
5757
});
5858
});
5959

6060
test( "positions", function() {
61-
var definitions = [];
62-
var offsets = {
63-
left: 0,
64-
center: 3,
65-
right: 6,
66-
top: 0,
67-
bottom: 6
68-
};
69-
var start = { left: 4, top: 4 };
61+
var definitions = [],
62+
offsets = {
63+
left: 0,
64+
center: 3,
65+
right: 6,
66+
top: 0,
67+
bottom: 6
68+
},
69+
start = { left: 4, top: 4 },
70+
el = $( "#el1" );
7071
$.each( [ 0, 1 ], function( my ) {
7172
$.each( [ "top", "center", "bottom" ], function( vindex, vertical ) {
7273
$.each( [ "left", "center", "right" ], function( hindex, horizontal ) {
@@ -81,7 +82,6 @@ test( "positions", function() {
8182
});
8283
});
8384
});
84-
var el = $( "#el1" );
8585
$.each( definitions, function( index, definition ) {
8686
el.position({
8787
my: definition.my,
@@ -445,12 +445,12 @@ test( "addClass: flipped left", function() {
445445

446446
deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Has ui-flipped-left class' );
447447

448-
elem.position( {
448+
elem.position({
449449
my: "right center",
450450
of: window,
451451
collision: "flip",
452452
at: "left center"
453-
})
453+
});
454454

455455
deepEqual( elem.hasClass( 'ui-flipped-left' ), false, 'Removed ui-flipped-left class' );
456456
});

0 commit comments

Comments
 (0)