]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6d659ba)
Seperated testswarm injection from testsuite extensions, to fix 'failing' testsuites...
authorjzaefferer <joern.zaefferer@gmail.com>
Sun, 29 Aug 2010 15:21:39 +0000 (17:21 +0200)
committerjzaefferer <joern.zaefferer@gmail.com>
Sun, 29 Aug 2010 15:21:39 +0000 (17:21 +0200)
18 files changed:
tests/unit/accordion/accordion.html patch | blob | history
tests/unit/autocomplete/autocomplete.html patch | blob | history
tests/unit/button/button.html patch | blob | history
tests/unit/core/core.html patch | blob | history
tests/unit/datepicker/datepicker.html patch | blob | history
tests/unit/dialog/dialog.html patch | blob | history
tests/unit/draggable/draggable.html patch | blob | history
tests/unit/droppable/droppable.html patch | blob | history
tests/unit/position/position.html patch | blob | history
tests/unit/progressbar/progressbar.html patch | blob | history
tests/unit/resizable/resizable.html patch | blob | history
tests/unit/selectable/selectable.html patch | blob | history
tests/unit/slider/slider.html patch | blob | history
tests/unit/sortable/sortable.html patch | blob | history
tests/unit/swarminject.js [new file with mode: 0644] patch | blob
tests/unit/tabs/tabs.html patch | blob | history
tests/unit/testsuite.js patch | blob | history
tests/unit/widget/widget.html patch | blob | history

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index c53db8c75688e5a2f50124feb05e4876ea311c4a..82098fa06a96acad3842dd46536effc2b25e0ba1 100644 (file)
--- 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 943708694b8c9b60b77173f4fb2e1567281cb20c..ae4580721641dc7e20706170ae900dca87934a42 100644 (file)
--- 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 7c6d0597742506aee601973fca903c86cabdbd24..0700eb8044a05ce078d33c0901c42643042c1d02 100644 (file)
--- 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 4f9e13bde17723034d9c41d4ffd6c656be666486..cbd8f6fed37e9167758f87b05d39da77f9372cfc 100644 (file)
--- 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 9354e7b99c259e7a4f3183c0904cd4530e4c80a1..16ebffb54892da7e05f7b5e77ba55c8c2ed3206a 100644 (file)
--- 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 d8260cc9f981c44ececd07aabc575aa4f328784e..4062f76aba87e796834c82746e50a135120e081c 100644 (file)
--- 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 2be472a50d408c51c450b68d42a10b6971c899ae..4e3a43da2793b15c57a08e49ecca2c8c332c745f 100644 (file)
--- 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 c15992bcdbc0858f369ecfe8f4c94fcc829c6e16..0b962b1cf4efde5fe3f45f53d96e610357efa9f2 100644 (file)
--- 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 ca5f2585de05c13c6a0e729e9453a0b970d0ba44..501583f8bd6fe871b528f4ac12b51650e707b390 100644 (file)
--- 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 9244135059f09ae10604f926db30c67e80c479ed..4e9bed9077a7d03cb3c17aef145c59f9af9180f9 100644 (file)
--- 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 0f4f91aaede3ee23f260830adc9bc8fb92d05e30..8081d8435447ec8f37d5c6398b48ae8dc6bb3e3e 100644 (file)
--- 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 278d4dde371d1a3539b2228f169332fb8ec9a7c1..cdb79dbcb0d187e602c860f1e134594da9d021e1 100644 (file)
--- 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 765340eb560fb5a3e6f3a9e08ff4f1e13b8fbcea..3df07c5174b5a7f664ccd72605712f7775e16daf 100644 (file)
--- 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 ad5cdca6d3d16e3f4f7a19f10f5aeac887df2624..071737ab09e8802e26cfc14885f6cfbc1b17ed7a 100644 (file)
--- 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 (file)
index 0000000..f7ca20d
--- /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 b00c8df032ee19eb6c70bac7c0e875df39da25a1..a3e73173f85675f401315496916c3bdf519e8fa7 100644 (file)
--- 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 9a16e9d0cb02be386d8ab705255537783216c83d..d152f84cd3a4ed1d783b866539e8261060842176 100644 (file)
--- 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 b2b9c0aa27bff28735937353afd13869ec7e488c..712f14409e6973a11fd0eb1d84d0ae9e236a86c6 100644 (file)
--- 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>
 
The official jQuery user interface library: https://github.com/jquery/jquery-ui