aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2009-09-15 21:12:05 +0000
committerJörn Zaefferer <joern.zaefferer@gmail.com>2009-09-15 21:12:05 +0000
commit06702d8b3007ca37db4578078901172c64ea97be (patch)
treeb59d7ddeed2063b2d22ad49f710939d39ab7d89f
parent0508fd0e04b104f0483f915cbc13b06605e08c0d (diff)
downloadjquery-ui-06702d8b3007ca37db4578078901172c64ea97be.tar.gz
jquery-ui-06702d8b3007ca37db4578078901172c64ea97be.zip
updated to latest QUnit
-rw-r--r--external/testrunner-r6574.js (renamed from external/testrunner-r6416.js)16
-rw-r--r--tests/unit/accordion/accordion.html2
-rw-r--r--tests/unit/accordion/accordion_methods.js5
-rw-r--r--tests/unit/all.html2
-rw-r--r--tests/unit/all_2.html2
-rw-r--r--tests/unit/core/core.html2
-rw-r--r--tests/unit/datepicker/datepicker.html2
-rw-r--r--tests/unit/defaults.html2
-rw-r--r--tests/unit/dialog/dialog.html2
-rw-r--r--tests/unit/draggable/draggable.html2
-rw-r--r--tests/unit/droppable/droppable.html2
-rw-r--r--tests/unit/position/position.html2
-rw-r--r--tests/unit/progressbar/progressbar.html2
-rw-r--r--tests/unit/resizable/resizable.html2
-rw-r--r--tests/unit/selectable/selectable.html2
-rw-r--r--tests/unit/slider/slider.html2
-rw-r--r--tests/unit/sortable/sortable.html2
-rw-r--r--tests/unit/tabs/tabs.html2
18 files changed, 24 insertions, 29 deletions
diff --git a/external/testrunner-r6416.js b/external/testrunner-r6574.js
index 8c28b6398..287081879 100644
--- a/external/testrunner-r6416.js
+++ b/external/testrunner-r6574.js
@@ -7,7 +7,7 @@
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
*
- * $Id: testrunner.js 6416 2009-07-10 16:08:27Z joern.zaefferer $
+ * $Id: testrunner.js 6574 2009-09-15 20:30:29Z joern.zaefferer $
*/
(function($) {
@@ -206,13 +206,8 @@ var equiv = function () {
}();
-var GETParams = $.map( location.search.slice(1).split('&'), decodeURIComponent ),
- ngindex = $.inArray("noglobals", GETParams),
- noglobals = ngindex !== -1;
+var GETParams = $.map( location.search.slice(1).split('&'), decodeURIComponent );
-if( noglobals )
- GETParams.splice( ngindex, 1 );
-
var config = {
stats: {
all: 0,
@@ -359,9 +354,8 @@ var pollution;
function saveGlobal(){
pollution = [ ];
- if( noglobals )
- for( var key in window )
- pollution.push(key);
+ for( var key in window )
+ pollution.push(key);
}
function checkPollution( name ){
var old = pollution;
@@ -415,8 +409,8 @@ function test(name, callback) {
});
synchronize(function() {
try {
- checkPollution();
lifecycle.teardown.call(testEnvironment);
+ checkPollution();
} catch(e) {
QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
}
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index 3943d914d..d300c0eec 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
index 91ed11c5a..bc77949d7 100644
--- a/tests/unit/accordion/accordion_methods.js
+++ b/tests/unit/accordion/accordion_methods.js
@@ -130,9 +130,10 @@ test("activate, string expression", function() {
ac.accordion("activate", ":eq(1)");
state(ac, 0, 1, 0);
ac.accordion("activate", ":last");
- state(ac, 0, 0, 1);
+ state(ac, 0, 1, 1);
});
-
+//[ 0, 1, 1 ] result: [ 0, 0, 1 ]
+//[ 0, 1, 1] result: [ 0, 0, 1]
test("activate, jQuery or DOM element", function() {
var ac = $('#list1').accordion({ active: $("#list1 a:last") });
state(ac, 0, 0, 1);
diff --git a/tests/unit/all.html b/tests/unit/all.html
index 236500d78..b2d75e3d2 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -18,7 +18,7 @@
<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
- <script type="text/javascript" src="../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script>
<script type="text/javascript" src="../jquery.simulate.js"></script>
<script type="text/javascript" src="testsuite.js"></script>
diff --git a/tests/unit/all_2.html b/tests/unit/all_2.html
index c586909ce..9ef1b1906 100644
--- a/tests/unit/all_2.html
+++ b/tests/unit/all_2.html
@@ -51,7 +51,7 @@
<script type="text/javascript" src="../../ui/ui.sortable.js"></script>
<script type="text/javascript" src="../../ui/ui.tabs.js"></script>
- <script type="text/javascript" src="../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script>
<script type="text/javascript" src="../jquery.simulate.js"></script>
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 6be62130b..db231e802 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -7,7 +7,7 @@
<script type="text/javascript" src="../../../ui/ui.core.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html
index 60673c7d0..f0db643ca 100644
--- a/tests/unit/datepicker/datepicker.html
+++ b/tests/unit/datepicker/datepicker.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../../../ui/i18n/ui.datepicker-he.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/defaults.html b/tests/unit/defaults.html
index 19e7b6ee8..d9afd0ed4 100644
--- a/tests/unit/defaults.html
+++ b/tests/unit/defaults.html
@@ -19,7 +19,7 @@
<link type="text/css" href="testsuite.css" rel="stylesheet" />
<script type="text/javascript" src="testsuite.js"></script>
- <script type="text/javascript" src="../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../external/jquery.cookie-r6165.js"></script>
<script type="text/javascript" src="../jquery.simulate.js"></script>
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 44e4cf650..fe8908a76 100644
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../../../ui/ui.dialog.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index 35e8c578d..01a5ebe8f 100644
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.draggable.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index d5e54fe6d..c549c4645 100644
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -9,7 +9,7 @@
<script type="text/javascript" src="../../../ui/ui.droppable.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index bc2343623..c43b90d81 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.position.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
<script type="text/javascript" src="position_core.js"></script>
diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index 7fb6c818d..e168c6ae3 100644
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.progressbar.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 3a159bcd5..0be2f8543 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.resizable.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index a42123f34..93881ea75 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.selectable.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 40a1db4ad..9d3d06032 100644
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.slider.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index e187c8620..c85cd1bde 100644
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.sortable.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>
diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 8d6736ab8..0baf6ce5a 100644
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -8,7 +8,7 @@
<script type="text/javascript" src="../../../ui/ui.tabs.js"></script>
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
- <script type="text/javascript" src="../../../external/testrunner-r6416.js"></script>
+ <script type="text/javascript" src="../../../external/testrunner-r6574.js"></script>
<script type="text/javascript" src="../../../external/jquery.cookie-r6165.js"></script>
<script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="../testsuite.js"></script>