Skip to content

Commit

Permalink
Selectmenu Tests: cleanup unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fnagel committed Apr 29, 2013
1 parent 4d986a4 commit c73f7e8
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 12 deletions.
1 change: 1 addition & 0 deletions tests/unit/selectmenu/selectmenu_common.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ TestHelpers.commonWidgetTests( "selectmenu", {
at: "left bottom",
collision: "none"
},

// callbacks
create: null,
change: null,
Expand Down
54 changes: 43 additions & 11 deletions tests/unit/selectmenu/selectmenu_core.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,25 @@ test("accessibility", function () {

equal( button.attr( "role" ), "combobox", "button link role" );
equal( button.attr( "aria-haspopup" ), "true", "button link aria-haspopup" );
equal( button.attr( "aria-expanded" ), "false", "button link aria-expanded" );
equal( button.attr( "aria-autocomplete" ), "list", "button link aria-autocomplete" );
equal( button.attr( "aria-expanded" ), "false", "button link aria-expanded" );
equal( button.attr( "aria-autocomplete" ), "list", "button link aria-autocomplete" );
equal( button.attr( "aria-owns" ), menu.attr("id"), "button link aria-owns" );
equal( button.attr( "aria-labelledby" ), links.eq( element[0].selectedIndex ).attr( "id" ), "button link aria-labelledby" );
equal(
button.attr( "aria-labelledby" ),
links.eq( element[0].selectedIndex ).attr( "id" ),
"button link aria-labelledby"
);
equal( button.attr( "tabindex" ), 0, "button link tabindex" );

equal( menu.attr( "role" ), "listbox", "menu role" );
equal( menu.attr( "aria-labelledby" ), button.attr( "id" ), "menu aria-labelledby" );
equal( menu.attr( "aria-hidden" ), "true", "menu aria-hidden" );
equal( menu.attr( "tabindex" ), 0, "menu tabindex" );
equal( menu.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "menu aria-activedescendant" );
equal(
menu.attr( "aria-activedescendant" ),
links.eq( element[ 0 ].selectedIndex ).attr( "id" ),
"menu aria-activedescendant"
);
$.each( links, function( index ){
equal( $( this ).attr( "role" ), "option", "menu link #" + index +" role" );
equal( $( this ).attr( "tabindex" ), -1, "menu link #" + index +" tabindex" );
Expand Down Expand Up @@ -56,9 +64,21 @@ $.each([
links = menu.find("li.ui-menu-item a");

button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
equal( menu.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "menu aria-activedescendant" );
equal( button.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "button aria-activedescendant" );
equal( element.find( "option:selected" ).val(), selected.next( "option" ).val() , "original select state" );
equal(
menu.attr( "aria-activedescendant" ),
links.eq( element[ 0 ].selectedIndex ).attr( "id" ),
"menu aria-activedescendant"
);
equal(
button.attr( "aria-activedescendant" ),
links.eq( element[ 0 ].selectedIndex ).attr( "id" ),
"button aria-activedescendant"
);
equal(
element.find( "option:selected" ).val(),
selected.next( "option" ).val() ,
"original select state"
);
equal( button.text(), selected.next( "option" ).text(), "button text" );
});

Expand All @@ -75,13 +95,25 @@ $.each([

button.simulate( "click" );
menu.find( "a" ).last().simulate( "mouseover" ).trigger( "click" );
equal( menu.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "menu aria-activedescendant" );
equal( button.attr( "aria-activedescendant" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "button aria-activedescendant" );
equal( element.find( "option:selected" ).val(), element.find( "option" ).last().val(), "original select state" );
equal(
menu.attr( "aria-activedescendant" ),
links.eq( element[ 0 ].selectedIndex ).attr( "id" ),
"menu aria-activedescendant"
);
equal(
button.attr( "aria-activedescendant" ),
links.eq( element[ 0 ].selectedIndex ).attr( "id" ),
"button aria-activedescendant"
);
equal(
element.find( "option:selected" ).val(),
element.find( "option" ).last().val(),
"original select state"
);
equal( button.text(), element.find( "option" ).last().text(), "button text" );
});

test( "state synchronization - after focus item and keydown on button - " + settings.type, function () {
test( "state synchronization - after focus item and keydown on button - " + settings.type, function () {
expect(4);

var links,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/selectmenu/selectmenu_events.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function ($) {
(function ( $ ) {

module( "selectmenu: events", {
setup: function () {
Expand Down

0 comments on commit c73f7e8

Please sign in to comment.