Tooltip: Handle multiple aria-describedby values.

1 files changed, 16 insertions, 4 deletions

diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js
index e2569fb01..e25eb3c13 100644
--- a/tests/unit/tooltip/tooltip_core.js
+++ b/tests/unit/tooltip/tooltip_core.js
@@ -3,7 +3,7 @@
 module( "tooltip: core" );
 
 test( "markup structure", function() {
-	expect( 6 );
+	expect( 7 );
 	var element = $( "#tooltipped1" ).tooltip(),
 		tooltip = $( ".ui-tooltip" );
 
@@ -11,8 +11,9 @@ test( "markup structure", function() {
 	equal( tooltip.length, 0, "no tooltip on init" );
 
 	element.tooltip( "open" );
-	tooltip = $( "#" + element.attr( "aria-describedby" ) );
+	tooltip = $( "#" + element.data( "ui-tooltip-id" ) );
 	equal( tooltip.length, 1, "tooltip exists" );
+	equal( element.attr( "aria-describedby"), tooltip.attr( "id" ), "aria-describedby" );
 	ok( tooltip.hasClass( "ui-tooltip" ), "tooltip is .ui-tooltip" );
 	equal( tooltip.length, 1, ".ui-tooltip exists" );
 	equal( tooltip.find( ".ui-tooltip-content" ).length, 1,
@@ -20,8 +21,19 @@ test( "markup structure", function() {
 });
 
 test( "accessibility", function() {
-	// TODO: add tests
-	expect( 0 );
+	// TODO: full tests
+	expect( 2 );
+
+	var tooltipId,
+		element = $( "#multiple-describedby" ).tooltip();
+
+	element.tooltip( "open" );
+	tooltipId = element.data( "ui-tooltip-id" );
+	equal( element.attr( "aria-describedby" ), "fixture-span " + tooltipId,
+		"multiple describedby when open" );
+	element.tooltip( "close" );
+	equal( element.attr( "aria-describedby" ), "fixture-span",
+		"correct describedby when closed" );
 });
 
 }( jQuery ) );