Skip to content

Commit

Permalink
Menu: Use new has/lacksClasses assertions for all class checks
Browse files Browse the repository at this point in the history
  • Loading branch information
@arschmitz
arschmitz committed Mar 11, 2015
1 parent 53d1bc2 commit 144826d
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 28 deletions.
4 changes: 2 additions & 2 deletions tests/unit/menu/menu_core.js
View file
Expand Up @@ -55,7 +55,7 @@ asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", functio
}); });
}); });


asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected item for Selectmenu", function() { asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected item for Selectmenu", function( assert ) {
expect( 1 ); expect( 1 );
var element = $( "#menu1" ).menu(), var element = $( "#menu1" ).menu(),
firstChild = element.children().eq( 0 ), firstChild = element.children().eq( 0 ),
Expand All @@ -64,7 +64,7 @@ asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected
element.menu( "focus", null, firstChild ); element.menu( "focus", null, firstChild );
wrapper.addClass( "ui-state-active" ); wrapper.addClass( "ui-state-active" );
setTimeout( function() { setTimeout( function() {
ok( wrapper.is( ".ui-state-active" ) ); assert.hasClasses( wrapper, "ui-state-active" );
start(); start();
}); });
}); });
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/menu/menu_events.js
View file
Expand Up @@ -671,13 +671,13 @@ test( "#9469: Stopping propagation in a select event should not suppress subsequ
equal( logOutput(), "1,2", "Both select events were not triggered." ); equal( logOutput(), "1,2", "Both select events were not triggered." );
}); });


asyncTest( "#10571: When typing in a menu, only menu-items should be focused", function() { asyncTest( "#10571: When typing in a menu, only menu-items should be focused", function( assert ) {
expect( 3 ); expect( 3 );


var element = $( "#menu8" ).menu({ var element = $( "#menu8" ).menu({
focus: function( event, ui ) { focus: function( event, ui ) {
equal( ui.item.length, 1, "There should only be one match when filtering" ); equal( ui.item.length, 1, "There should only be one match when filtering" );
ok( ui.item.hasClass( "ui-menu-item" ), "element is .ui-menu-item" ); assert.hasClasses( ui.item, "ui-menu-item" );
equal( ui.item.text(), "-Saarland", "element has correct text" ); equal( ui.item.text(), "-Saarland", "element has correct text" );
} }
}); });
Expand Down
14 changes: 7 additions & 7 deletions tests/unit/menu/menu_methods.js
View file
Expand Up @@ -20,20 +20,20 @@ test( "destroy", function() {
}); });
}); });


test( "enable/disable", function() { test( "enable/disable", function( assert ) {
expect( 3 ); expect( 3 );
var element = $( "#menu1" ).menu({ var element = $( "#menu1" ).menu({
select: function() { select: function() {
log(); log();
} }
}); });
element.menu( "disable" ); element.menu( "disable" );
ok( element.is( ".ui-state-disabled" ), "Missing ui-state-disabled class" ); assert.hasClasses( element, "ui-state-disabled" );
log( "click", true ); log( "click", true );
click( element, "1" ); click( element, "1" );
log( "afterclick" ); log( "afterclick" );
element.menu( "enable" ); element.menu( "enable" );
ok( element.not( ".ui-state-disabled" ), "Has ui-state-disabled class" ); assert.lacksClasses( element, "ui-state-disabled" );
log( "click" ); log( "click" );
click( element, "1" ); click( element, "1" );
log( "afterclick" ); log( "afterclick" );
Expand Down Expand Up @@ -63,18 +63,18 @@ test( "refresh submenu", function() {
equal( element.find( "ul:first .ui-menu-item" ).length, 4 ); equal( element.find( "ul:first .ui-menu-item" ).length, 4 );
}); });


test( "refresh icons (see #9377)", function() { test( "refresh icons (see #9377)", function( assert ) {
expect( 3 ); expect( 3 );
var element = $( "#menu1" ).menu(); var element = $( "#menu1" ).menu();
ok( !element.hasClass( "ui-menu-icons") ); assert.lacksClasses( element, "ui-menu-icons" );
element.find( "li:first .ui-menu-item-wrapper" ) element.find( "li:first .ui-menu-item-wrapper" )
.html( "<span class='ui-icon ui-icon-disk'></span>Save</a>" ); .html( "<span class='ui-icon ui-icon-disk'></span>Save</a>" );
element.menu( "refresh" ); element.menu( "refresh" );


ok( element.hasClass( "ui-menu-icons" ) ); assert.hasClasses( element, "ui-menu-icons" );
element.find( "li:first .ui-menu-item-wrapper" ).html( "Save" ); element.find( "li:first .ui-menu-item-wrapper" ).html( "Save" );
element.menu( "refresh" ); element.menu( "refresh" );
ok( !element.hasClass( "ui-menu-icons" ) ); assert.lacksClasses( element, "ui-menu-icons" );
}); });


test( "widget", function() { test( "widget", function() {
Expand Down
40 changes: 23 additions & 17 deletions tests/unit/menu/menu_options.js
View file
Expand Up @@ -10,75 +10,81 @@ module( "menu: options", {
} }
}); });


test( "{ disabled: true }", function() { test( "{ disabled: true }", function( assert ) {
expect( 2 ); expect( 2 );
var element = $( "#menu1" ).menu({ var element = $( "#menu1" ).menu({
disabled: true, disabled: true,
select: function() { select: function() {
log(); log();
} }
}); });
ok( element.hasClass( "ui-state-disabled" ), "Missing ui-state-disabled class" ); assert.hasClasses( element, "ui-state-disabled" );
log( "click", true ); log( "click", true );
click( element, "1" ); click( element, "1" );
log( "afterclick" ); log( "afterclick" );
equal( logOutput(), "click,afterclick", "Click order not valid." ); equal( logOutput(), "click,afterclick", "Click order not valid." );
}); });


test( "{ disabled: false }", function() { test( "{ disabled: false }", function( assert ) {
expect( 2 ); expect( 2 );
var element = $( "#menu1" ).menu({ var element = $( "#menu1" ).menu({
disabled: false, disabled: false,
select: function() { select: function() {
log(); log();
} }
}); });
ok( !element.hasClass( "ui-state-disabled" ), "Has ui-state-disabled class" ); assert.lacksClasses( element, "ui-state-disabled" );
log( "click", true ); log( "click", true );
click( element, "1" ); click( element, "1" );
log( "afterclick" ); log( "afterclick" );
equal( logOutput(), "click,1,afterclick", "Click order not valid." ); equal( logOutput(), "click,1,afterclick", "Click order not valid." );
}); });


test( "{ icons: default }", function() { test( "{ icons: default }", function( assert ) {
expect( 2 ); expect( 8 );
var element = $( "#menu2" ).menu(); var element = $( "#menu2" ).menu();
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-caret-1-e" ); element.find( ".ui-menu-icon" ).each( function() {
assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-caret-1-e" );
});


element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" ); element.menu( "option", "icons.submenu", "ui-icon-triangle-1-e" );
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon ui-icon-triangle-1-e" ); element.find( ".ui-menu-icon" ).each( function() {
assert.hasClasses( this, "ui-menu-icon ui-icon ui-icon-triangle-1-e" );
});
}); });


test( "{ icons: { submenu: 'custom' } }", function() { test( "{ icons: { submenu: 'custom' } }", function( assert ) {
expect( 1 ); expect( 4 );
var element = $( "#menu2" ).menu({ var element = $( "#menu2" ).menu({
icons: { icons: {
submenu: "custom-class" submenu: "custom-class"
} }
}); });
equal( element.find( ".ui-menu-icon" ).attr( "class" ), "ui-menu-icon ui-icon custom-class" ); element.find( ".ui-menu-icon" ).each( function() {
assert.hasClasses( this, "ui-menu-icon ui-icon custom-class" );
});
}); });


// TODO: test menus option // TODO: test menus option


// TODO: test position option // TODO: test position option


test( "{ role: 'menu' } ", function() { test( "{ role: 'menu' } ", function( assert ) {
var element = $( "#menu1" ).menu(), var element = $( "#menu1" ).menu(),
items = element.find( "li" ); items = element.find( "li" );
expect( 2 + 3 * items.length ); expect( 2 + 3 * items.length );
equal( element.attr( "role" ), "menu" ); equal( element.attr( "role" ), "menu" );
ok( items.length > 0, "number of menu items" ); ok( items.length > 0, "number of menu items" );
items.each(function( item ) { items.each(function( item ) {
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); assert.hasClasses( $( this ), "ui-menu-item" );
equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ),
"menuitem", "menu item ("+ item + ") role" ); "menuitem", "menu item ("+ item + ") role" );
equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1", equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
"tabindex for menu item ("+ item + ")" ); "tabindex for menu item ("+ item + ")" );
}); });
}); });


test( "{ role: 'listbox' } ", function() { test( "{ role: 'listbox' } ", function( assert ) {
var element = $( "#menu1" ).menu({ var element = $( "#menu1" ).menu({
role: "listbox" role: "listbox"
}), }),
Expand All @@ -87,15 +93,15 @@ test( "{ role: 'listbox' } ", function() {
equal( element.attr( "role" ), "listbox" ); equal( element.attr( "role" ), "listbox" );
ok( items.length > 0, "number of menu items" ); ok( items.length > 0, "number of menu items" );
items.each(function( item ) { items.each(function( item ) {
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); assert.hasClasses( $( this ), "ui-menu-item" );
equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), "option", equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), "option",
"menu item ("+ item + ") role" ); "menu item ("+ item + ") role" );
equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1", equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
"tabindex for menu item ("+ item + ")" ); "tabindex for menu item ("+ item + ")" );
}); });
}); });


test( "{ role: null }", function() { test( "{ role: null }", function( assert ) {
var element = $( "#menu1" ).menu({ var element = $( "#menu1" ).menu({
role: null role: null
}), }),
Expand All @@ -104,7 +110,7 @@ test( "{ role: null }", function() {
strictEqual( element.attr( "role" ), undefined ); strictEqual( element.attr( "role" ), undefined );
ok( items.length > 0, "number of menu items" ); ok( items.length > 0, "number of menu items" );
items.each(function( item ) { items.each(function( item ) {
ok( $( this ).hasClass( "ui-menu-item" ), "menu item ("+ item + ") class for item" ); assert.hasClasses( $( this ), "ui-menu-item" );
equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), undefined, equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "role" ), undefined,
"menu item ("+ item + ") role" ); "menu item ("+ item + ") role" );
equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1", equal( $( this ).find( ".ui-menu-item-wrapper" ).attr( "tabindex" ), "-1",
Expand Down

0 comments on commit 144826d

Please sign in to comment.