Skip to content

Commit 9e8e339

Browse files
jzaeffererjzaefferer
committed
Unit tests: Disable stale interaction tests only on testswarm, but allow them to run locally
1 parent 65c2255 commit 9e8e339

File tree

4 files changed

+48
-16
lines changed

4 files changed

+48
-16
lines changed

‎tests/unit/droppable/droppable.html‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,25 @@
1414
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
1515
<script type="text/javascript" src="../../../external/qunit.js"></script>
1616
<script type="text/javascript" src="../../jquery.simulate.js"></script>
17-
<script type="text/javascript" src="../testsuite.js"></script>
1817

19-
<!--
2018
<script type="text/javascript" src="droppable_core.js"></script>
2119
<script type="text/javascript" src="droppable_defaults.js"></script>
2220
<script type="text/javascript" src="droppable_events.js"></script>
2321
<script type="text/javascript" src="droppable_methods.js"></script>
2422
<script type="text/javascript" src="droppable_options.js"></script>
2523
<script type="text/javascript" src="droppable_tickets.js"></script>
26-
-->
27-
<script type="text/javascript">test("droppable", function() { ok(true, "disabled droppable testsuite"); });</script>
24+
25+
<script type="text/javascript">
26+
// disable this stale testsuite for testswarm only
27+
var url = window.location.search;
28+
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
29+
if ( url && url.indexOf("http") == 0 ) {
30+
// reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script
31+
QUnit.init();
32+
test("droppable", function() { ok(true, "disabled droppable testsuite"); });
33+
}
34+
</script>
35+
<script type="text/javascript" src="../testsuite.js"></script>
2836
</head>
2937
<body>
3038

‎tests/unit/resizable/resizable.html‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,25 @@
1515
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
1616
<script type="text/javascript" src="../../../external/qunit.js"></script>
1717
<script type="text/javascript" src="../../jquery.simulate.js"></script>
18-
<script type="text/javascript" src="../testsuite.js"></script>
1918

20-
<!--
2119
<script type="text/javascript" src="resizable_core.js"></script>
2220
<script type="text/javascript" src="resizable_defaults.js"></script>
2321
<script type="text/javascript" src="resizable_events.js"></script>
2422
<script type="text/javascript" src="resizable_methods.js"></script>
2523
<script type="text/javascript" src="resizable_options.js"></script>
2624
<script type="text/javascript" src="resizable_tickets.js"></script>
27-
-->
28-
<script type="text/javascript">test("resizable", function() { ok(true, "disabled resizable testsuite"); });</script>
25+
26+
<script type="text/javascript">
27+
// disable this stale testsuite for testswarm only
28+
var url = window.location.search;
29+
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
30+
if ( url && url.indexOf("http") == 0 ) {
31+
// reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script
32+
QUnit.init();
33+
test("resizable", function() { ok(true, "disabled resizable testsuite"); });
34+
}
35+
</script>
36+
<script type="text/javascript" src="../testsuite.js"></script>
2937
</head>
3038
<body>
3139

‎tests/unit/selectable/selectable.html‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,25 @@
1313
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
1414
<script type="text/javascript" src="../../../external/qunit.js"></script>
1515
<script type="text/javascript" src="../../jquery.simulate.js"></script>
16-
<script type="text/javascript" src="../testsuite.js"></script>
1716

18-
<!--
1917
<script type="text/javascript" src="selectable_core.js"></script>
2018
<script type="text/javascript" src="selectable_defaults.js"></script>
2119
<script type="text/javascript" src="selectable_events.js"></script>
2220
<script type="text/javascript" src="selectable_methods.js"></script>
2321
<script type="text/javascript" src="selectable_options.js"></script>
2422
<script type="text/javascript" src="selectable_tickets.js"></script>
25-
-->
26-
<script type="text/javascript">test("selectable", function() { ok(true, "disabled selectable testsuite"); });</script>
23+
24+
<script type="text/javascript">
25+
// disable this stale testsuite for testswarm only
26+
var url = window.location.search;
27+
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
28+
if ( url && url.indexOf("http") == 0 ) {
29+
// reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script
30+
QUnit.init();
31+
test("selectable", function() { ok(true, "disabled selectable testsuite"); });
32+
}
33+
</script>
34+
<script type="text/javascript" src="../testsuite.js"></script>
2735
</head>
2836
<body>
2937

‎tests/unit/sortable/sortable.html‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,25 @@
1313
<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
1414
<script type="text/javascript" src="../../../external/qunit.js"></script>
1515
<script type="text/javascript" src="../../jquery.simulate.js"></script>
16-
<script type="text/javascript" src="../testsuite.js"></script>
1716

18-
<!--
1917
<script type="text/javascript" src="sortable_core.js"></script>
2018
<script type="text/javascript" src="sortable_defaults.js"></script>
2119
<script type="text/javascript" src="sortable_events.js"></script>
2220
<script type="text/javascript" src="sortable_methods.js"></script>
2321
<script type="text/javascript" src="sortable_options.js"></script>
2422
<script type="text/javascript" src="sortable_tickets.js"></script>
25-
-->
26-
<script type="text/javascript">test("sortable", function() { ok(true, "disabled sortable testsuite"); });</script>
23+
24+
<script type="text/javascript">
25+
// disable this stale testsuite for testswarm only
26+
var url = window.location.search;
27+
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) );
28+
if ( url && url.indexOf("http") == 0 ) {
29+
// reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script
30+
QUnit.init();
31+
test("sortable", function() { ok(true, "disabled sortable testsuite"); });
32+
}
33+
</script>
34+
<script type="text/javascript" src="../testsuite.js"></script>
2735
</head>
2836
<body>
2937

0 commit comments

Comments
 (0)