Skip to content
Permalink
Browse files

Seperated testswarm injection from testsuite extensions, to fix 'fail…

…ing' testsuites on TestSwarm due to unhandled errors and race conditions
  • Loading branch information
jzaefferer committed Aug 29, 2010
1 parent 6d659ba commit d8bee228b37e1dd3b6e81a145729b762cdf90b09
@@ -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; }
@@ -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">

@@ -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>

@@ -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}
@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>

@@ -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>");
})();
@@ -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>

@@ -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>");
})();
@@ -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>

0 comments on commit d8bee22

Please sign in to comment.
You can’t perform that action at this time.