From 7af3dab075b71b4a4b542e3e3201229399a56959 Mon Sep 17 00:00:00 2001
From: Felix Nagel <info@felixnagel.com>
Date: Thu, 10 Oct 2013 01:01:41 +0200
Subject: Selectmenu: Remove links in menu items

---
 tests/unit/selectmenu/selectmenu_core.js   | 18 +++++++++---------
 tests/unit/selectmenu/selectmenu_events.js |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/selectmenu_core.js
index d8b449828..60c350eb3 100644
--- a/tests/unit/selectmenu/selectmenu_core.js
+++ b/tests/unit/selectmenu/selectmenu_core.js
@@ -9,7 +9,7 @@ asyncTest( "accessibility", function() {
 		menu = element.selectmenu( "menuWidget" );
 
 	button.simulate( "focus" );
-	links = menu.find( "li.ui-menu-item a" );
+	links = menu.find( "li.ui-menu-item" );
 
 	expect( 12 + links.length * 2 );
 
@@ -65,7 +65,7 @@ $.each([
 
 		button.simulate( "focus" );
 		setTimeout(function() {
-			links = menu.find("li.ui-menu-item a");
+			links = menu.find("li.ui-menu-item");
 
 			button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 			equal(
@@ -98,10 +98,10 @@ $.each([
 
 		button.simulate( "focus" );
 		setTimeout(function() {
-			links = menu.find("li.ui-menu-item a");
+			links = menu.find("li.ui-menu-item");
 
 			button.trigger( "click" );
-			menu.find( "a" ).last().simulate( "mouseover" ).trigger( "click" );
+			menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
 			equal(
 				menu.attr( "aria-activedescendant" ),
 				links.eq( element[ 0 ].selectedIndex ).attr( "id" ),
@@ -135,7 +135,7 @@ $.each([
 		button.simulate( "focus" );
 
 		setTimeout(function() {
-			links = menu.find( "li.ui-menu-item a" );
+			links = menu.find( "li.ui-menu-item" );
 			// open menu and click first item
 			button.trigger( "click" );
 			links.first().simulate( "mouseover" ).trigger( "click" );
@@ -169,7 +169,7 @@ $.each([
 		button.simulate( "focus" );
 
 		setTimeout(function() {
-			links = menu.find( "li.ui-menu-item a" );
+			links = menu.find( "li.ui-menu-item" );
 
 			button.trigger( "click" );
 			links.first().simulate( "mouseover" ).trigger( "click" );
@@ -196,7 +196,7 @@ $.each([
 		button.simulate( "focus" );
 
 		setTimeout(function() {
-			links = menu.find( "li.ui-menu-item a" );
+			links = menu.find( "li.ui-menu-item" );
 
 			button.trigger( "click" );
 			setTimeout(function() {
@@ -221,11 +221,11 @@ $.each([
 		}, 1 );
 
 		function checkItemClasses() {
-			focusedItem = menu.find( "li.ui-menu-item a.ui-state-focus" );
+			focusedItem = menu.find( "li.ui-state-focus" );
 			equal( focusedItem.length, 1, "only one item has ui-state-focus class" );
 			equal( focusedItem.attr( "id" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "selected item has ui-state-focus class" );
 
-			activeItem = menu.find( "li.ui-menu-item a.ui-state-active" );
+			activeItem = menu.find( "li.ui-state-active" );
 			equal( activeItem.length, 1, "only one item has ui-state-active class" );
 			equal( activeItem.attr( "id" ), links.eq( element[ 0 ].selectedIndex ).attr( "id" ), "selected item has ui-state-active class" );
 		}
diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js
index 353780ee5..182c0cd1b 100644
--- a/tests/unit/selectmenu/selectmenu_events.js
+++ b/tests/unit/selectmenu/selectmenu_events.js
@@ -30,7 +30,7 @@ asyncTest( "change", function () {
 
 	setTimeout(function() {
 		button.trigger( "click" );
-		menu.find( "a" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
+		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
 		start();
 	}, 1 );
 });
@@ -79,7 +79,7 @@ asyncTest( "focus", function () {
 		button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
 
 		button.trigger( "click" );
-		links = menu.find( "li.ui-menu-item a" );
+		links = menu.find( "li.ui-menu-item" );
 		optionIndex = 0;
 		links.eq( optionIndex ).simulate( "mouseover" );
 		optionIndex += 1;
@@ -127,7 +127,7 @@ asyncTest( "select", function () {
 
 	setTimeout(function() {
 		button.trigger( "click" );
-		menu.find( "a" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
+		menu.find( "li" ).eq( optionIndex ).simulate( "mouseover" ).trigger( "click" );
 		start();
 	}, 1 );
 });
-- 
cgit v1.2.3