aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/widget
diff options
context:
space:
mode:
authorDan Wellman <danwellman@hotmail.com>2011-11-28 08:38:34 +0000
committerDan Wellman <danwellman@hotmail.com>2011-11-28 08:38:34 +0000
commita4fd5449b24b998ffa514f01b735da2b6465a80a (patch)
tree51b1c2828e85f538775e22cf5e3a930a8c4fe506 /tests/unit/widget
parentfce4725a8ac599efab5449710550a029a2d6fbe3 (diff)
parent53ea93327e9040b7472e8fd2af2abaea19058e4a (diff)
downloadjquery-ui-a4fd5449b24b998ffa514f01b735da2b6465a80a.tar.gz
jquery-ui-a4fd5449b24b998ffa514f01b735da2b6465a80a.zip
Merge remote-tracking branch 'upstream/selectmenu' into selectmenu
Diffstat (limited to 'tests/unit/widget')
-rw-r--r--tests/unit/widget/all.html2
-rw-r--r--tests/unit/widget/widget_core.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html
index 83df4905c..ae8bc3c66 100644
--- a/tests/unit/widget/all.html
+++ b/tests/unit/widget/all.html
@@ -4,7 +4,7 @@
<meta charset="utf-8">
<title>jQuery UI Widget Test Suite</title>
- <script src="../../../jquery-1.7.js"></script>
+ <script src="../../../jquery-1.7.1.js"></script>
<link rel="stylesheet" href="../../../external/qunit.css">
<link rel="stylesheet" href="../subsuiteRunner.css">
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index edf1ae0fc..2e55ad703 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -1031,7 +1031,7 @@ test( "redefine", function() {
$.widget( "ui.testWidget", $.ui.testWidget, {
method: function( str ) {
equal( str, "foo", "new invoked with correct parameter" );
- this._super();
+ this._super( "bar" );
}
});