Skip to content

Commit cc713d9

Browse files
liammclennanliammclennan
committed
Merge pull request liammclennan#29 from sukima/upgrade-qunit
Upgrades QUnit to 1.10
2 parents 8dcda84 + 36657c7 commit cc713d9

21 files changed

+2095
-1057
lines changed

‎jskoans.htm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
</head>
2828
<body>
29-
<h1 id="qunit-header">QUnit example</h1>
29+
<h1 id="qunit-header">JavaScript Koans</h1>
3030
<h2 id="qunit-banner"></h2>
3131
<h2 id="qunit-userAgent"></h2>
3232
<h3 class="welcome_message">To begin, find the file 'topics/about_asserts.js', and complete the tests.</h3>

‎support/koans.js‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,24 @@ Array.prototype.equalTo = function(compareTo) {
1414
return true;
1515
};
1616

17-
QUnit.done = function(failures, total) {
18-
if (failures > 0) {
19-
var failed = $('ol#qunit-tests > li.fail');
20-
failed.hide();
21-
$(failed[0]).show();
22-
}
23-
if (failures < total) {
24-
$('h3.welcome_message').hide();
25-
}
26-
};
17+
(function() {
18+
19+
QUnit.config.reorder = false;
20+
21+
QUnit.done(function(results) {
22+
var failures = results.failed;
23+
var total = results.total;
24+
if (failures > 0) {
25+
var failed = $('ol#qunit-tests > li.fail');
26+
failed.hide();
27+
$(failed[0]).show();
28+
}
29+
if (failures < total) {
30+
$('h3.welcome_message').hide();
31+
}
32+
if (failures > 0) {
33+
$("#zen-help").show();
34+
}
35+
});
2736

37+
})();

‎support/qunit.css‎

Lines changed: 124 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
/**
2+
* QUnit v1.12.0 - A JavaScript Unit Testing Framework
3+
*
4+
* http://qunitjs.com
5+
*
6+
* Copyright 2012 jQuery Foundation and other contributors
7+
* Released under the MIT license.
8+
* http://jquery.org/license
9+
*/
10+
111
/** Font Family and Sizes */
212

313
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
4-
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial;
14+
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
515
}
616

717
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
@@ -10,7 +20,7 @@
1020

1121
/** Resets */
1222

13-
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
23+
#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
1424
margin: 0;
1525
padding: 0;
1626
}
@@ -20,28 +30,44 @@
2030

2131
#qunit-header {
2232
padding: 0.5em 0 0.5em 1em;
23-
24-
color: #fff;
25-
text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
33+
34+
color: #8699a4;
2635
background-color: #0d3349;
27-
28-
border-radius: 15px 15px 0 0;
29-
-moz-border-radius: 15px 15px 0 0;
30-
-webkit-border-top-right-radius: 15px;
31-
-webkit-border-top-left-radius: 15px;
36+
37+
font-size: 1.5em;
38+
line-height: 1em;
39+
font-weight: normal;
40+
41+
border-radius: 5px 5px 0 0;
42+
-moz-border-radius: 5px 5px 0 0;
43+
-webkit-border-top-right-radius: 5px;
44+
-webkit-border-top-left-radius: 5px;
3245
}
3346

3447
#qunit-header a {
3548
text-decoration: none;
36-
color: white;
49+
color: #c2ccd1;
50+
}
51+
52+
#qunit-header a:hover,
53+
#qunit-header a:focus {
54+
color: #fff;
55+
}
56+
57+
#qunit-testrunner-toolbar label {
58+
display: inline-block;
59+
padding: 0 .5em 0 .1em;
3760
}
3861

3962
#qunit-banner {
4063
height: 5px;
4164
}
4265

4366
#qunit-testrunner-toolbar {
44-
padding: 0em 0 0.5em 2em;
67+
padding: 0.5em 0 0.5em 2em;
68+
color: #5E740B;
69+
background-color: #eee;
70+
overflow: hidden;
4571
}
4672

4773
#qunit-userAgent {
@@ -51,6 +77,9 @@
5177
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
5278
}
5379

80+
#qunit-modulefilter-container {
81+
float: right;
82+
}
5483

5584
/** Tests: Pass/Fail */
5685

@@ -64,23 +93,75 @@
6493
list-style-position: inside;
6594
}
6695

96+
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
97+
display: none;
98+
}
99+
67100
#qunit-tests li strong {
68101
cursor: pointer;
69102
}
70103

71-
#qunit-tests ol {
104+
#qunit-tests li a {
105+
padding: 0.5em;
106+
color: #c2ccd1;
107+
text-decoration: none;
108+
}
109+
#qunit-tests li a:hover,
110+
#qunit-tests li a:focus {
111+
color: #000;
112+
}
113+
114+
#qunit-tests li .runtime {
115+
float: right;
116+
font-size: smaller;
117+
}
118+
119+
.qunit-assert-list {
72120
margin-top: 0.5em;
73121
padding: 0.5em;
74-
122+
75123
background-color: #fff;
76-
77-
border-radius: 15px;
78-
-moz-border-radius: 15px;
79-
-webkit-border-radius: 15px;
80-
81-
box-shadow: inset 0px 2px 13px #999;
82-
-moz-box-shadow: inset 0px 2px 13px #999;
83-
-webkit-box-shadow: inset 0px 2px 13px #999;
124+
125+
border-radius: 5px;
126+
-moz-border-radius: 5px;
127+
-webkit-border-radius: 5px;
128+
}
129+
130+
.qunit-collapsed {
131+
display: none;
132+
}
133+
134+
#qunit-tests table {
135+
border-collapse: collapse;
136+
margin-top: .2em;
137+
}
138+
139+
#qunit-tests th {
140+
text-align: right;
141+
vertical-align: top;
142+
padding: 0 .5em 0 0;
143+
}
144+
145+
#qunit-tests td {
146+
vertical-align: top;
147+
}
148+
149+
#qunit-tests pre {
150+
margin: 0;
151+
white-space: pre-wrap;
152+
word-wrap: break-word;
153+
}
154+
155+
#qunit-tests del {
156+
background-color: #e0f2be;
157+
color: #374e0c;
158+
text-decoration: none;
159+
}
160+
161+
#qunit-tests ins {
162+
background-color: #ffcaca;
163+
color: #500;
164+
text-decoration: none;
84165
}
85166

86167
/*** Test Counts */
@@ -90,8 +171,7 @@
90171
#qunit-tests b.failed { color: #710909; }
91172

92173
#qunit-tests li li {
93-
margin: 0.5em;
94-
padding: 0.4em 0.5em 0.4em 0.5em;
174+
padding: 5px;
95175
background-color: #fff;
96176
border-bottom: none;
97177
list-style-position: inside;
@@ -100,14 +180,14 @@
100180
/*** Passing Styles */
101181

102182
#qunit-tests li li.pass {
103-
color: #5E740B;
183+
color: #3c510c;
104184
background-color: #fff;
105-
border-left: 26px solid #C6E746;
185+
border-left: 10px solid #C6E746;
106186
}
107187

108188
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
109189
#qunit-tests .pass .test-name { color: #366097; }
110-
190+
111191
#qunit-tests .pass .test-actual,
112192
#qunit-tests .pass .test-expected { color: #999999; }
113193

@@ -118,7 +198,15 @@
118198
#qunit-tests li li.fail {
119199
color: #710909;
120200
background-color: #fff;
121-
border-left: 26px solid #EE5757;
201+
border-left: 10px solid #EE5757;
202+
white-space: pre;
203+
}
204+
205+
#qunit-tests > li:last-child {
206+
border-radius: 0 0 5px 5px;
207+
-moz-border-radius: 0 0 5px 5px;
208+
-webkit-border-bottom-right-radius: 5px;
209+
-webkit-border-bottom-left-radius: 5px;
122210
}
123211

124212
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
@@ -128,22 +216,21 @@
128216
#qunit-tests .fail .test-actual { color: #EE5757; }
129217
#qunit-tests .fail .test-expected { color: green; }
130218

131-
#qunit-banner.qunit-fail,
132-
#qunit-testrunner-toolbar { background-color: #EE5757; }
219+
#qunit-banner.qunit-fail { background-color: #EE5757; }
133220

134221

135-
/** Footer */
222+
/** Result */
136223

137224
#qunit-testresult {
138225
padding: 0.5em 0.5em 0.5em 2.5em;
139226

140227
color: #2b81af;
141228
background-color: #D2E0E6;
142229

143-
border-radius: 0 0 15px 15px;
144-
-moz-border-radius: 0 0 15px 15px;
145-
-webkit-border-bottom-right-radius: 15px;
146-
-webkit-border-bottom-left-radius: 15px;
230+
border-bottom: 1px solid white;
231+
}
232+
#qunit-testresult .module-name {
233+
font-weight: bold;
147234
}
148235

149236
/** Fixture */
@@ -152,4 +239,6 @@
152239
position: absolute;
153240
top: -10000px;
154241
left: -10000px;
242+
width: 1000px;
243+
height: 1000px;
155244
}

0 commit comments

Comments
 (0)