Skip to content

Commit ce3c7fa

Browse files
jzaeffererjzaefferer
committed
Update to official qunit composite addon
1 parent 2357d6d commit ce3c7fa

File tree

26 files changed

+159
-140
lines changed

26 files changed

+159
-140
lines changed

‎tests/unit/accordion/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/all-active.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../external/qunit.css">
10-
<link rel="stylesheet" href="subsuiteRunner.css">
10+
<link rel="stylesheet" href="qunit-composite.css">
1111
<script src="../../external/qunit.js"></script>
12-
<script src="subsuiteRunner.js"></script>
12+
<script src="qunit-composite.js"></script>
1313

1414
<script>
1515
(function() {

‎tests/unit/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../external/qunit.css">
10-
<link rel="stylesheet" href="subsuiteRunner.css">
10+
<link rel="stylesheet" href="qunit-composite.css">
1111
<script src="../../external/qunit.js"></script>
12-
<script src="subsuiteRunner.js"></script>
12+
<script src="qunit-composite.js"></script>
1313

1414
<script>
1515
(function() {

‎tests/unit/autocomplete/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/button/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/core/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/datepicker/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/dialog/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/draggable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/droppable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/effects/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/menu/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/position/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/progressbar/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/qunit-composite.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
iframe.qunit-subsuite{
2+
position: fixed;
3+
bottom: 0;
4+
left: 0;
5+
6+
margin: 0;
7+
padding: 0;
8+
border-width: 1px 0 0;
9+
height: 45%;
10+
width: 100%;
11+
12+
background: #fff;
13+
}

‎tests/unit/qunit-composite.js

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
(function( QUnit ) {
2+
3+
QUnit.extend( QUnit, {
4+
testSuites: function( suites ) {
5+
QUnit.begin(function() {
6+
QUnit.initIframe();
7+
});
8+
9+
for ( var i = 0; i < suites.length; i++ ) {
10+
(function( suite ) {
11+
asyncTest( suite, function() {
12+
QUnit.runSuite( suite );
13+
});
14+
}( suites[i] ) );
15+
}
16+
QUnit.done(function() {
17+
this.iframe.style.display = "none";
18+
});
19+
},
20+
21+
runSuite: function( suite ) {
22+
this.iframe.setAttribute( "src", suite );
23+
},
24+
25+
initIframe: function() {
26+
var body = document.body,
27+
iframe = this.iframe = document.createElement( "iframe" ),
28+
iframeWin;
29+
30+
iframe.className = "qunit-subsuite";
31+
body.appendChild( iframe );
32+
33+
function onIframeLoad() {
34+
var module, test,
35+
count = 0;
36+
37+
38+
iframeWin.QUnit.moduleStart(function( data ) {
39+
// capture module name for messages
40+
module = data.name;
41+
});
42+
43+
iframeWin.QUnit.testStart(function( data ) {
44+
// capture test name for messages
45+
test = data.name;
46+
});
47+
iframeWin.QUnit.testDone(function() {
48+
test = null;
49+
});
50+
51+
iframeWin.QUnit.log(function( data ) {
52+
if (test === null) {
53+
return;
54+
}
55+
// pass all test details through to the main page
56+
var message = module + ": " + test + ": " + data.message;
57+
expect( ++count );
58+
QUnit.push( data.result, data.actual, data.expected, message );
59+
});
60+
61+
iframeWin.QUnit.done(function() {
62+
// start the wrapper test from the main page
63+
start();
64+
});
65+
}
66+
QUnit.addEvent( iframe, "load", onIframeLoad );
67+
68+
iframeWin = iframe.contentWindow;
69+
}
70+
});
71+
72+
QUnit.testStart(function( data ) {
73+
// update the test status to show which test suite is running
74+
QUnit.id( "qunit-testresult" ).innerHTML = "Running " + data.name + "...<br>&nbsp;";
75+
});
76+
77+
QUnit.testDone(function() {
78+
var current = QUnit.id( this.config.current.id ),
79+
children = current.children,
80+
src = this.iframe.src;
81+
82+
// undo the auto-expansion of failed tests
83+
for ( var i = 0; i < children.length; i++ ) {
84+
if ( children[i].nodeName === "OL" ) {
85+
children[i].style.display = "none";
86+
}
87+
}
88+
89+
QUnit.addEvent(current, "dblclick", function( e ) {
90+
var target = e && e.target ? e.target : window.event.srcElement;
91+
if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
92+
target = target.parentNode;
93+
}
94+
if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
95+
window.location = src;
96+
}
97+
});
98+
99+
current.getElementsByTagName('a')[0].href = src;
100+
});
101+
102+
}( QUnit ) );

‎tests/unit/resizable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/selectable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/slider/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/sortable/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/spinner/all.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<script src="../../../jquery-1.7.2.js"></script>
88

99
<link rel="stylesheet" href="../../../external/qunit.css">
10-
<link rel="stylesheet" href="../subsuiteRunner.css">
10+
<link rel="stylesheet" href="../qunit-composite.css">
1111
<script src="../../../external/qunit.js"></script>
12-
<script src="../subsuiteRunner.js"></script>
12+
<script src="../qunit-composite.js"></script>
1313
<script src="../subsuite.js"></script>
1414

1515
<script>

‎tests/unit/subsuiteRunner.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)