diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/accordion/accordion.html | 1 | ||||
-rw-r--r-- | tests/unit/autocomplete/autocomplete.html | 1 | ||||
-rw-r--r-- | tests/unit/button/button.html | 1 | ||||
-rw-r--r-- | tests/unit/core/core.html | 3 | ||||
-rw-r--r-- | tests/unit/datepicker/datepicker.html | 3 | ||||
-rw-r--r-- | tests/unit/dialog/dialog.html | 2 | ||||
-rw-r--r-- | tests/unit/draggable/draggable.html | 3 | ||||
-rw-r--r-- | tests/unit/droppable/droppable.html | 3 | ||||
-rw-r--r-- | tests/unit/position/position.html | 2 | ||||
-rw-r--r-- | tests/unit/progressbar/progressbar.html | 2 | ||||
-rw-r--r-- | tests/unit/resizable/resizable.html | 3 | ||||
-rw-r--r-- | tests/unit/selectable/selectable.html | 3 | ||||
-rw-r--r-- | tests/unit/slider/slider.html | 2 | ||||
-rw-r--r-- | tests/unit/sortable/sortable.html | 3 | ||||
-rw-r--r-- | tests/unit/swarminject.js | 9 | ||||
-rw-r--r-- | tests/unit/tabs/tabs.html | 2 | ||||
-rw-r--r-- | tests/unit/testsuite.js | 10 | ||||
-rw-r--r-- | tests/unit/widget/widget.html | 2 |
18 files changed, 35 insertions, 20 deletions
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html index c53db8c75..82098fa06 100644 --- a/tests/unit/accordion/accordion.html +++ b/tests/unit/accordion/accordion.html @@ -46,6 +46,7 @@ <script type="text/javascript" src="accordion_options.js"></script> <script type="text/javascript" src="accordion_tickets.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> <style> #main { font-size: 10pt; font-family: 'trebuchet ms', verdana, arial; } #list, #list1 *, #navigation, #navigation * { margin: 0; padding: 0; font-size: 12px; } diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html index 943708694..ae4580721 100644 --- a/tests/unit/autocomplete/autocomplete.html +++ b/tests/unit/autocomplete/autocomplete.html @@ -25,6 +25,7 @@ <script type="text/javascript" src="autocomplete_options.js"></script> <script type="text/javascript" src="autocomplete_tickets.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body id="body"> diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html index 7c6d05977..0700eb804 100644 --- a/tests/unit/button/button.html +++ b/tests/unit/button/button.html @@ -23,6 +23,7 @@ <script type="text/javascript" src="button_options.js"></script> <script type="text/javascript" src="button_tickets.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html index 4f9e13bde..cbd8f6fed 100644 --- a/tests/unit/core/core.html +++ b/tests/unit/core/core.html @@ -11,6 +11,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="core.js"></script> <script type="text/javascript" src="selector.js"></script> @@ -25,7 +26,7 @@ test("core", function() { ok(true, "disabled core testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> <style type="text/css"> .zindex {z-index: 100} diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html index 9354e7b99..16ebffb54 100644 --- a/tests/unit/datepicker/datepicker.html +++ b/tests/unit/datepicker/datepicker.html @@ -16,6 +16,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="datepicker_core.js"></script> <script type="text/javascript" src="datepicker_defaults.js"></script> @@ -34,7 +35,7 @@ test("datepicker", function() { ok(true, "disabled datepicker testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index d8260cc9f..4062f76ab 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -38,7 +38,7 @@ test("dialog", function() { ok(true, "disabled dialog testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html index 2be472a50..4e3a43da2 100644 --- a/tests/unit/draggable/draggable.html +++ b/tests/unit/draggable/draggable.html @@ -13,6 +13,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="draggable_core.js"></script> <script type="text/javascript" src="draggable_defaults.js"></script> @@ -31,7 +32,7 @@ test("draggable", function() { ok(true, "disabled draggable testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html index c15992bcd..0b962b1cf 100644 --- a/tests/unit/droppable/droppable.html +++ b/tests/unit/droppable/droppable.html @@ -14,6 +14,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="droppable_core.js"></script> <script type="text/javascript" src="droppable_defaults.js"></script> @@ -32,7 +33,7 @@ test("droppable", function() { ok(true, "disabled droppable testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html index ca5f2585d..501583f8b 100644 --- a/tests/unit/position/position.html +++ b/tests/unit/position/position.html @@ -13,6 +13,8 @@ <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="position_core.js"></script> + + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html index 924413505..4e9bed907 100644 --- a/tests/unit/progressbar/progressbar.html +++ b/tests/unit/progressbar/progressbar.html @@ -22,6 +22,8 @@ <script type="text/javascript" src="progressbar_methods.js"></script> <script type="text/javascript" src="progressbar_options.js"></script> <script type="text/javascript" src="progressbar_tickets.js"></script> + + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html index 0f4f91aae..8081d8435 100644 --- a/tests/unit/resizable/resizable.html +++ b/tests/unit/resizable/resizable.html @@ -15,6 +15,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="resizable_core.js"></script> <script type="text/javascript" src="resizable_defaults.js"></script> @@ -33,7 +34,7 @@ test("resizable", function() { ok(true, "disabled resizable testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html index 278d4dde3..cdb79dbcb 100644 --- a/tests/unit/selectable/selectable.html +++ b/tests/unit/selectable/selectable.html @@ -13,6 +13,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="selectable_core.js"></script> <script type="text/javascript" src="selectable_defaults.js"></script> @@ -31,7 +32,7 @@ test("selectable", function() { ok(true, "disabled selectable testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html index 765340eb5..3df07c517 100644 --- a/tests/unit/slider/slider.html +++ b/tests/unit/slider/slider.html @@ -34,7 +34,7 @@ test("slider", function() { ok(true, "disabled slider testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html index ad5cdca6d..071737ab0 100644 --- a/tests/unit/sortable/sortable.html +++ b/tests/unit/sortable/sortable.html @@ -13,6 +13,7 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> + <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="sortable_core.js"></script> <script type="text/javascript" src="sortable_defaults.js"></script> @@ -31,7 +32,7 @@ test("sortable", function() { ok(true, "disabled sortable testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/swarminject.js b/tests/unit/swarminject.js new file mode 100644 index 000000000..f7ca20d82 --- /dev/null +++ b/tests/unit/swarminject.js @@ -0,0 +1,9 @@ +// load testswarm agent +(function() { + var url = window.location.search; + url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) ); + if ( !url || url.indexOf("http") !== 0 ) { + return; + } + document.write("<scr" + "ipt src='http://localhost/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>"); +})(); diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index b00c8df03..a3e73173f 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -34,7 +34,7 @@ test("tabs", function() { ok(true, "disabled tabs testsuite"); }); } </script> - <script type="text/javascript" src="../testsuite.js"></script> + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js index 9a16e9d0c..d152f84cd 100644 --- a/tests/unit/testsuite.js +++ b/tests/unit/testsuite.js @@ -37,13 +37,3 @@ function commonWidgetTests(widget, settings) { testWidgetDefaults(widget, settings.defaults); testWidgetOverrides(widget); } - -// load testswarm agent -(function() { - var url = window.location.search; - url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) ); - if ( !url || url.indexOf("http") !== 0 ) { - return; - } - document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date).getTime() + "'></scr" + "ipt>"); -})(); diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html index b2b9c0aa2..712f14409 100644 --- a/tests/unit/widget/widget.html +++ b/tests/unit/widget/widget.html @@ -15,6 +15,8 @@ <script type="text/javascript" src="widget_core.js"></script> <script type="text/javascript" src="widget_tickets.js"></script> + + <script type="text/javascript" src="../swarminject.js"></script> </head> <body> |