Skip to content

Commit 66efe74

Browse files
scottgonzalezGabriel Schulhof
scottgonzalez
authored and
Gabriel Schulhof
committed
Build: Upgrade to QUnit 1.14.0
1 parent afda227 commit 66efe74

5 files changed

Lines changed: 1165 additions & 781 deletions

File tree

‎Gruntfile.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ module.exports = function( grunt ) {
905905
files: {
906906
"qunit/qunit.js": "qunit/qunit/qunit.js",
907907
"qunit/qunit.css": "qunit/qunit/qunit.css",
908+
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
908909
"jshint/jshint.js": "jshint/dist/jshint.js"
909910
}
910911
},

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"devDependencies": {
2323
"requirejs": "2.1.2",
24-
"qunit": "1.9.0",
24+
"qunit": "1.14.0",
2525
"jshint": "2.4.0",
2626
"requirejs-text": "2.0.3",
2727
"requirejs-plugins": "millermedeiros/requirejs-plugins#34330a5d735474ac0b518eb1eb270c9e5505a537"

‎external/qunit/MIT-LICENSE.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright 2013 jQuery Foundation and other contributors
2+
http://jquery.com/
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎external/qunit/qunit.css‎

Lines changed: 51 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
/**
2-
* QUnit v1.9.0 - A JavaScript Unit Testing Framework
1+
/*!
2+
* QUnit 1.14.0
3+
* http://qunitjs.com/
34
*
4-
* http://docs.jquery.com/QUnit
5+
* Copyright 2013 jQuery Foundation and other contributors
6+
* Released under the MIT license
7+
* http://jquery.org/license
58
*
6-
* Copyright (c) 2012 John Resig, Jörn Zaefferer
7-
* Dual licensed under the MIT (MIT-LICENSE.txt)
8-
* or GPL (GPL-LICENSE.txt) licenses.
9+
* Date: 2014-01-31T16:40Z
910
*/
1011

1112
/** Font Family and Sizes */
@@ -20,7 +21,7 @@
2021

2122
/** Resets */
2223

23-
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
24+
#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
2425
margin: 0;
2526
padding: 0;
2627
}
@@ -31,32 +32,29 @@
3132
#qunit-header {
3233
padding: 0.5em 0 0.5em 1em;
3334

34-
color: #8699a4;
35-
background-color: #0d3349;
35+
color: #8699A4;
36+
background-color: #0D3349;
3637

3738
font-size: 1.5em;
3839
line-height: 1em;
39-
font-weight: normal;
40+
font-weight: 400;
4041

4142
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;
4543
}
4644

4745
#qunit-header a {
4846
text-decoration: none;
49-
color: #c2ccd1;
47+
color: #C2CCD1;
5048
}
5149

5250
#qunit-header a:hover,
5351
#qunit-header a:focus {
54-
color: #fff;
52+
color: #FFF;
5553
}
5654

5755
#qunit-testrunner-toolbar label {
5856
display: inline-block;
59-
padding: 0 .5em 0 .1em;
57+
padding: 0 0.5em 0 0.1em;
6058
}
6159

6260
#qunit-banner {
@@ -66,16 +64,20 @@
6664
#qunit-testrunner-toolbar {
6765
padding: 0.5em 0 0.5em 2em;
6866
color: #5E740B;
69-
background-color: #eee;
67+
background-color: #EEE;
68+
overflow: hidden;
7069
}
7170

7271
#qunit-userAgent {
7372
padding: 0.5em 0 0.5em 2.5em;
74-
background-color: #2b81af;
75-
color: #fff;
73+
background-color: #2B81AF;
74+
color: #FFF;
7675
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
7776
}
7877

78+
#qunit-modulefilter-container {
79+
float: right;
80+
}
7981

8082
/** Tests: Pass/Fail */
8183

@@ -85,7 +87,7 @@
8587

8688
#qunit-tests li {
8789
padding: 0.4em 0.5em 0.4em 2.5em;
88-
border-bottom: 1px solid #fff;
90+
border-bottom: 1px solid #FFF;
8991
list-style-position: inside;
9092
}
9193

@@ -99,34 +101,41 @@
99101

100102
#qunit-tests li a {
101103
padding: 0.5em;
102-
color: #c2ccd1;
104+
color: #C2CCD1;
103105
text-decoration: none;
104106
}
105107
#qunit-tests li a:hover,
106108
#qunit-tests li a:focus {
107109
color: #000;
108110
}
109111

110-
#qunit-tests ol {
112+
#qunit-tests li .runtime {
113+
float: right;
114+
font-size: smaller;
115+
}
116+
117+
.qunit-assert-list {
111118
margin-top: 0.5em;
112119
padding: 0.5em;
113120

114-
background-color: #fff;
121+
background-color: #FFF;
115122

116123
border-radius: 5px;
117-
-moz-border-radius: 5px;
118-
-webkit-border-radius: 5px;
124+
}
125+
126+
.qunit-collapsed {
127+
display: none;
119128
}
120129

121130
#qunit-tests table {
122131
border-collapse: collapse;
123-
margin-top: .2em;
132+
margin-top: 0.2em;
124133
}
125134

126135
#qunit-tests th {
127136
text-align: right;
128137
vertical-align: top;
129-
padding: 0 .5em 0 0;
138+
padding: 0 0.5em 0 0;
130139
}
131140

132141
#qunit-tests td {
@@ -140,68 +149,65 @@
140149
}
141150

142151
#qunit-tests del {
143-
background-color: #e0f2be;
144-
color: #374e0c;
152+
background-color: #E0F2BE;
153+
color: #374E0C;
145154
text-decoration: none;
146155
}
147156

148157
#qunit-tests ins {
149-
background-color: #ffcaca;
158+
background-color: #FFCACA;
150159
color: #500;
151160
text-decoration: none;
152161
}
153162

154163
/*** Test Counts */
155164

156-
#qunit-tests b.counts { color: black; }
165+
#qunit-tests b.counts { color: #000; }
157166
#qunit-tests b.passed { color: #5E740B; }
158167
#qunit-tests b.failed { color: #710909; }
159168

160169
#qunit-tests li li {
161170
padding: 5px;
162-
background-color: #fff;
171+
background-color: #FFF;
163172
border-bottom: none;
164173
list-style-position: inside;
165174
}
166175

167176
/*** Passing Styles */
168177

169178
#qunit-tests li li.pass {
170-
color: #3c510c;
171-
background-color: #fff;
179+
color: #3C510C;
180+
background-color: #FFF;
172181
border-left: 10px solid #C6E746;
173182
}
174183

175184
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
176185
#qunit-tests .pass .test-name { color: #366097; }
177186

178187
#qunit-tests .pass .test-actual,
179-
#qunit-tests .pass .test-expected { color: #999999; }
188+
#qunit-tests .pass .test-expected { color: #999; }
180189

181190
#qunit-banner.qunit-pass { background-color: #C6E746; }
182191

183192
/*** Failing Styles */
184193

185194
#qunit-tests li li.fail {
186195
color: #710909;
187-
background-color: #fff;
196+
background-color: #FFF;
188197
border-left: 10px solid #EE5757;
189198
white-space: pre;
190199
}
191200

192201
#qunit-tests > li:last-child {
193202
border-radius: 0 0 5px 5px;
194-
-moz-border-radius: 0 0 5px 5px;
195-
-webkit-border-bottom-right-radius: 5px;
196-
-webkit-border-bottom-left-radius: 5px;
197203
}
198204

199-
#qunit-tests .fail { color: #000000; background-color: #EE5757; }
205+
#qunit-tests .fail { color: #000; background-color: #EE5757; }
200206
#qunit-tests .fail .test-name,
201-
#qunit-tests .fail .module-name { color: #000000; }
207+
#qunit-tests .fail .module-name { color: #000; }
202208

203209
#qunit-tests .fail .test-actual { color: #EE5757; }
204-
#qunit-tests .fail .test-expected { color: green; }
210+
#qunit-tests .fail .test-expected { color: #008000; }
205211

206212
#qunit-banner.qunit-fail { background-color: #EE5757; }
207213

@@ -211,13 +217,13 @@
211217
#qunit-testresult {
212218
padding: 0.5em 0.5em 0.5em 2.5em;
213219

214-
color: #2b81af;
220+
color: #2B81AF;
215221
background-color: #D2E0E6;
216222

217-
border-bottom: 1px solid white;
223+
border-bottom: 1px solid #FFF;
218224
}
219225
#qunit-testresult .module-name {
220-
font-weight: bold;
226+
font-weight: 700;
221227
}
222228

223229
/** Fixture */

0 commit comments

Comments
 (0)