aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/tooltip
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-07-28 15:16:20 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-07-28 15:16:20 +0200
commit5a45f483d73578dd147229d412998bba4a44c35b (patch)
tree540e9c5ca8502fa0277d072de973a9c676134793 /tests/unit/tooltip
parent5297b7bc4250462213b05ad2763fe99d0f8dedec (diff)
parent0ba493d3b4f9d6da35cadc499e9f7ebb6adb31b3 (diff)
downloadjquery-ui-5a45f483d73578dd147229d412998bba4a44c35b.tar.gz
jquery-ui-5a45f483d73578dd147229d412998bba4a44c35b.zip
Merge branch 'master' into widget-delegation
Diffstat (limited to 'tests/unit/tooltip')
-rw-r--r--tests/unit/tooltip/tooltip.html2
-rw-r--r--tests/unit/tooltip/tooltip_methods.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 21eff51fd..10bd0f22e 100644
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" href="../../../themes/base/jquery.ui.tooltip.css">
- <script src="../../../jquery-1.5.1.js"></script>
+ <script src="../../../jquery-1.6.2.js"></script>
<script src="../../../ui/jquery.ui.core.js"></script>
<script src="../../../ui/jquery.ui.widget.js"></script>
<script src="../../../ui/jquery.ui.position.js"></script>
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index 798d55896..74fd35d84 100644
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -40,7 +40,7 @@ test( "enable/disable", function() {
element.tooltip( "disable" );
equal( $( ".ui-tooltip" ).length, 0, "no tooltip when disabled" );
- equal( tooltip.attr( "title" ), "", "title removed on disable" );
+ equal( tooltip.attr( "title" ), undefined, "title removed on disable" );
element.tooltip( "open" );
equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" );