Skip to content

Commit f764578

Browse files
committed
Spinner: Use new has/lacksClasses assertions for all class checks
1 parent 8f26f0a commit f764578

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

tests/unit/spinner/spinner_methods.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@ test( "destroy", function() {
1111
});
1212
});
1313

14-
test( "disable", function() {
15-
expect( 16 );
14+
test( "disable", function( assert ) {
15+
expect( 15 );
1616
var element = $( "#spin" ).val( 2 ).spinner(),
1717
wrapper = $( "#spin" ).spinner( "widget" );
1818

19-
ok( !wrapper.hasClass( "ui-spinner-disabled" ), "before: wrapper does not have ui-spinner-disabled class" );
19+
assert.lacksClasses( wrapper, "ui-spinner-disabled" );
2020
ok( !element.is( ":disabled" ), "before: input does not have disabled attribute" );
2121

2222
element.spinner( "disable" );
23-
ok( wrapper.hasClass( "ui-spinner-disabled" ), "after: wrapper has ui-spinner-disabled class" );
24-
ok( wrapper.hasClass( "ui-state-disabled" ), "after: wrapper has ui-state-disabled class" );
23+
assert.hasClasses( wrapper, "ui-state-disabled ui-spinner-disabled" );
2524
ok( !wrapper.attr( "aria-disabled" ), "after: wrapper does not have aria-disabled attr" );
2625
ok( element.is( ":disabled"), "after: input has disabled attribute" );
2726

@@ -56,17 +55,17 @@ test( "disable", function() {
5655
equal( 7, element.val(), "script - pageDown 1 page changes value" );
5756
});
5857

59-
test( "enable", function() {
58+
test( "enable", function( assert ) {
6059
expect( 5 );
6160
var element = $( "#spin" ).val( 1 ).spinner({ disabled: true }),
6261
wrapper = element.spinner( "widget" );
6362

64-
ok( wrapper.hasClass( "ui-spinner-disabled" ), "before: wrapper has ui-spinner-disabled class" );
63+
assert.hasClasses( wrapper, "ui-spinner-disabled" );
6564
ok( element.is( ":disabled" ), "before: input has disabled attribute" );
6665

6766
element.spinner( "enable" );
6867

69-
ok( !wrapper.hasClass( ".ui-spinner-disabled" ), "after: wrapper does not have ui-spinner-disabled class" );
68+
assert.lacksClasses( wrapper, "ui-spinner-disabled" );
7069
ok( !element.is( ":disabled" ), "after: input does not have disabled attribute" );
7170

7271
simulateKeyDownUp( element, $.ui.keyCode.UP );

tests/unit/spinner/spinner_options.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,34 @@ module( "spinner: options" );
44

55
// culture is tested after numberFormat, since it depends on numberFormat
66

7-
test( "icons: default ", function() {
7+
test( "icons: default ", function( assert ) {
88
expect( 4 );
99
var element = $( "#spin" ).val( 0 ).spinner();
10-
equal( element.spinner( "widget" ).find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-triangle-1-n" );
11-
equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-triangle-1-s" );
10+
assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
11+
"ui-icon ui-icon-triangle-1-n" );
12+
assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
13+
"ui-icon ui-icon-triangle-1-s" );
1214

1315
element.spinner( "option", "icons", {
1416
up: "ui-icon-caret-1-n",
1517
down: "ui-icon-caret-1-s"
1618
});
17-
equal( element.spinner( "widget" ).find( ".ui-icon:first" ).attr( "class" ), "ui-icon ui-icon-caret-1-n" );
18-
equal( element.spinner( "widget" ).find( ".ui-icon:last" ).attr( "class" ), "ui-icon ui-icon-caret-1-s" );
19+
assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:first" ),
20+
"ui-icon ui-icon-caret-1-n" );
21+
assert.hasClasses( element.spinner( "widget" ).find( ".ui-icon:last" ),
22+
"ui-icon ui-icon-caret-1-s" );
1923
});
2024

21-
test( "icons: custom ", function() {
25+
test( "icons: custom ", function( assert ) {
2226
expect( 2 );
2327
var element = $( "#spin" ).val( 0 ).spinner({
2428
icons: {
2529
down: "custom-down",
2630
up: "custom-up"
2731
}
2832
}).spinner( "widget" );
29-
equal( element.find( ".ui-icon:first" ).attr( "class" ), "ui-icon custom-up" );
30-
equal( element.find( ".ui-icon:last" ).attr( "class" ), "ui-icon custom-down" );
33+
assert.hasClasses( element.find( ".ui-icon:first" ), "ui-icon custom-up" );
34+
assert.hasClasses( element.find( ".ui-icon:last" ), "ui-icon custom-down" );
3135
});
3236

3337
test( "incremental, false", function() {

0 commit comments

Comments
 (0)