Skip to content

Commit

Permalink
updated to latest QUnit
Browse files Browse the repository at this point in the history
  • Loading branch information
@jzaefferer
jzaefferer committed Sep 15, 2009
1 parent 0508fd0 commit 06702d8
Show file tree
Hide file tree
Showing 18 changed files with 24 additions and 29 deletions.
16 changes: 5 additions & 11 deletions external/testrunner-r6416.js → external/testrunner-r6574.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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($) {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/accordion/accordion.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
5 changes: 3 additions & 2 deletions tests/unit/accordion/accordion_methods.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/all_2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/core/core.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/datepicker/datepicker.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/defaults.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/dialog/dialog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/draggable/draggable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/droppable/droppable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/position/position.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/progressbar/progressbar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/resizable/resizable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/selectable/selectable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/slider/slider.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/sortable/sortable.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/tabs/tabs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 06702d8

Please sign in to comment.