Merge branch 'master' into selectmenu

2 files changed, 30 insertions, 1 deletions

diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html
index 367eb4584..6329326b9 100644
--- a/tests/unit/tooltip/all.html
+++ b/tests/unit/tooltip/all.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Tooltip Test Suite</title>
 
-	<script src="../../../jquery-1.8.0.js"></script>
+	<script src="../../../jquery-1.8.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<link rel="stylesheet" href="../qunit-composite.css">
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index 771da6da7..db193e8fa 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -46,6 +46,35 @@ asyncTest( "content: sync + async callback", function() {
 	}).tooltip( "open" );
 });
 
+test( "content: change while open", function() {
+	expect( 2 ) ;
+	var element = $( "#tooltipped1" ).tooltip({
+		content: function() {
+			return "old";
+		}
+	});
+
+	element.one( "tooltipopen", function( event, ui ) {
+		equal( ui.tooltip.text(), "old", "original content" );
+		element.tooltip( "option", "content", function() {
+			return "new";
+		});
+		equal( ui.tooltip.text(), "new", "updated content" );
+	});
+
+	element.tooltip( "open" );
+});
+
+test( "content: string", function() {
+	expect( 1 );
+	var element = $( "#tooltipped1" ).tooltip({
+		content: "just a string",
+		open: function( event, ui ) {
+			equal( ui.tooltip.text(), "just a string" );
+		}
+	}).tooltip( "open" );
+});
+
 test( "items", function() {
 	expect( 2 );
 	var event,