Skip to content

Commit f1e9bb3

Browse files
paulirishpaulirish
committed
QUnit updated to 1.2.0pre - which is master, which is 1 day past the 1.1.0 release. :)
1 parent 5e213a8 commit f1e9bb3

File tree

3 files changed

+1010
-612
lines changed

3 files changed

+1010
-612
lines changed

‎test/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html>
33
<head>
44
<title>QUnit Tests</title>
55
<link rel="stylesheet" href="qunit/qunit.css" media="screen">
@@ -20,12 +20,12 @@
2020

2121

2222
</head>
23-
<body class="flora">
23+
<body>
2424
<h1 id="qunit-header">QUnit Test Suite</h1>
2525
<h2 id="qunit-banner"></h2>
2626
<div id="qunit-testrunner-toolbar"></div>
2727
<h2 id="qunit-userAgent"></h2>
2828
<ol id="qunit-tests"></ol>
2929
<div id="qunit-fixture">test markup</div>
3030
</body>
31-
</html>
31+
</html>

‎test/qunit/qunit.css

Lines changed: 109 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
1+
/**
2+
* QUnit 1.2.0pre - A JavaScript Unit Testing Framework
3+
*
4+
* http://docs.jquery.com/QUnit
5+
*
6+
* Copyright (c) 2011 John Resig, Jörn Zaefferer
7+
* Dual licensed under the MIT (MIT-LICENSE.txt)
8+
* or GPL (GPL-LICENSE.txt) licenses.
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 li ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
23+
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
1424
margin: 0;
1525
padding: 0;
1626
}
@@ -20,23 +30,38 @@
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-
36+
37+
font-size: 1.5em;
38+
line-height: 1em;
39+
font-weight: normal;
40+
2841
border-radius: 15px 15px 0 0;
2942
-moz-border-radius: 15px 15px 0 0;
3043
-webkit-border-top-right-radius: 15px;
3144
-webkit-border-top-left-radius: 15px;
3245
}
3346

47+
#qunit-header a {
48+
text-decoration: none;
49+
color: #c2ccd1;
50+
}
51+
52+
#qunit-header a:hover,
53+
#qunit-header a:focus {
54+
color: #fff;
55+
}
56+
3457
#qunit-banner {
3558
height: 5px;
3659
}
3760

3861
#qunit-testrunner-toolbar {
39-
padding: 0em 0 0.5em 2em;
62+
padding: 0.5em 0 0.5em 2em;
63+
color: #5E740B;
64+
background-color: #eee;
4065
}
4166

4267
#qunit-userAgent {
@@ -59,25 +84,78 @@
5984
list-style-position: inside;
6085
}
6186

87+
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
88+
display: none;
89+
}
90+
6291
#qunit-tests li strong {
6392
cursor: pointer;
6493
}
6594

66-
#qunit-tests li ol {
95+
#qunit-tests li a {
96+
padding: 0.5em;
97+
color: #c2ccd1;
98+
text-decoration: none;
99+
}
100+
#qunit-tests li a:hover,
101+
#qunit-tests li a:focus {
102+
color: #000;
103+
}
104+
105+
#qunit-tests ol {
67106
margin-top: 0.5em;
68107
padding: 0.5em;
69-
108+
70109
background-color: #fff;
71-
110+
72111
border-radius: 15px;
73112
-moz-border-radius: 15px;
74113
-webkit-border-radius: 15px;
75-
114+
76115
box-shadow: inset 0px 2px 13px #999;
77116
-moz-box-shadow: inset 0px 2px 13px #999;
78117
-webkit-box-shadow: inset 0px 2px 13px #999;
79118
}
80119

120+
#qunit-tests table {
121+
border-collapse: collapse;
122+
margin-top: .2em;
123+
}
124+
125+
#qunit-tests th {
126+
text-align: right;
127+
vertical-align: top;
128+
padding: 0 .5em 0 0;
129+
}
130+
131+
#qunit-tests td {
132+
vertical-align: top;
133+
}
134+
135+
#qunit-tests pre {
136+
margin: 0;
137+
white-space: pre-wrap;
138+
word-wrap: break-word;
139+
}
140+
141+
#qunit-tests del {
142+
background-color: #e0f2be;
143+
color: #374e0c;
144+
text-decoration: none;
145+
}
146+
147+
#qunit-tests ins {
148+
background-color: #ffcaca;
149+
color: #500;
150+
text-decoration: none;
151+
}
152+
153+
/*** Test Counts */
154+
155+
#qunit-tests b.counts { color: black; }
156+
#qunit-tests b.passed { color: #5E740B; }
157+
#qunit-tests b.failed { color: #710909; }
158+
81159
#qunit-tests li li {
82160
margin: 0.5em;
83161
padding: 0.4em 0.5em 0.4em 0.5em;
@@ -94,13 +172,11 @@
94172
border-left: 26px solid #C6E746;
95173
}
96174

97-
#qunit-tests li.pass { color: #528CE0; background-color: #D2E0E6; }
98-
#qunit-tests li.pass span.test-name { color: #366097; }
99-
100-
#qunit-tests li li.pass span.test-actual,
101-
#qunit-tests li li.pass span.test-expected { color: #999999; }
175+
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
176+
#qunit-tests .pass .test-name { color: #366097; }
102177

103-
strong b.pass { color: #5E740B; }
178+
#qunit-tests .pass .test-actual,
179+
#qunit-tests .pass .test-expected { color: #999999; }
104180

105181
#qunit-banner.qunit-pass { background-color: #C6E746; }
106182

@@ -110,33 +186,35 @@ strong b.pass { color: #5E740B; }
110186
color: #710909;
111187
background-color: #fff;
112188
border-left: 26px solid #EE5757;
189+
white-space: pre;
113190
}
114191

115-
#qunit-tests li.fail { color: #000000; background-color: #EE5757; }
116-
#qunit-tests li.fail span.test-name,
117-
#qunit-tests li.fail span.module-name { color: #000000; }
192+
#qunit-tests > li:last-child {
193+
border-radius: 0 0 15px 15px;
194+
-moz-border-radius: 0 0 15px 15px;
195+
-webkit-border-bottom-right-radius: 15px;
196+
-webkit-border-bottom-left-radius: 15px;
197+
}
118198

119-
#qunit-tests li li.fail span.test-actual { color: #EE5757; }
120-
#qunit-tests li li.fail span.test-expected { color: green; }
199+
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
200+
#qunit-tests .fail .test-name,
201+
#qunit-tests .fail .module-name { color: #000000; }
121202

122-
strong b.fail { color: #710909; }
203+
#qunit-tests .fail .test-actual { color: #EE5757; }
204+
#qunit-tests .fail .test-expected { color: green; }
123205

124-
#qunit-banner.qunit-fail,
125-
#qunit-testrunner-toolbar { background-color: #EE5757; }
206+
#qunit-banner.qunit-fail { background-color: #EE5757; }
126207

127208

128-
/** Footer */
209+
/** Result */
129210

130211
#qunit-testresult {
131212
padding: 0.5em 0.5em 0.5em 2.5em;
132-
213+
133214
color: #2b81af;
134215
background-color: #D2E0E6;
135216

136-
border-radius: 0 0 15px 15px;
137-
-moz-border-radius: 0 0 15px 15px;
138-
-webkit-border-bottom-right-radius: 15px;
139-
-webkit-border-bottom-left-radius: 15px;
217+
border-bottom: 1px solid white;
140218
}
141219

142220
/** Fixture */

0 commit comments

Comments
 (0)