Skip to content

Commit 5c067f7

Browse files
apsdehalGabriel Schulhof
apsdehal
authored and
Gabriel Schulhof
committed
Bower: Update QUnit version to 1.17.1
Fixes jquery-archivegh-8033 Closes jquery-archivegh-8010
1 parent 9b8d017 commit 5c067f7

File tree

11 files changed

+1879
-1235
lines changed

11 files changed

+1879
-1235
lines changed

‎Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ module.exports = function( grunt ) {
983983
files: {
984984
"qunit/qunit.js": "qunit/qunit/qunit.js",
985985
"qunit/qunit.css": "qunit/qunit/qunit.css",
986-
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
986+
"qunit/LICENSE.txt": "qunit/LICENSE.txt",
987987
"jshint/jshint.js": "jshint/dist/jshint.js"
988988
}
989989
},

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"devDependencies": {
2121
"requirejs": "2.1.2",
22-
"qunit": "1.14.0",
22+
"qunit": "1.17.1",
2323
"jshint": "2.4.0",
2424
"requirejs-text": "2.0.3",
2525
"requirejs-plugins": "millermedeiros/requirejs-plugins#34330a5d735474ac0b518eb1eb270c9e5505a537"

‎external/qunit/MIT-LICENSE.txt renamed to ‎external/qunit/LICENSE.txt

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
Copyright 2013 jQuery Foundation and other contributors
2-
http://jquery.com/
1+
Copyright jQuery Foundation and other contributors, https://jquery.org/
2+
3+
This software consists of voluntary contributions made by many
4+
individuals. For exact contribution history, see the revision history
5+
available at https://github.com/jquery/qunit
6+
7+
The following license applies to all parts of this software except as
8+
documented below:
9+
10+
====
311

412
Permission is hereby granted, free of charge, to any person obtaining
513
a copy of this software and associated documentation files (the
@@ -19,3 +27,10 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1927
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2028
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2129
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30+
31+
====
32+
33+
All files located in the node_modules and external directories are
34+
externally maintained libraries used by this software which have their
35+
own licenses; we recommend you read them, as their terms may differ from
36+
the terms above.

‎external/qunit/qunit.css

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*!
2-
* QUnit 1.14.0
2+
* QUnit 1.17.1
33
* http://qunitjs.com/
44
*
5-
* Copyright 2013 jQuery Foundation and other contributors
5+
* Copyright jQuery Foundation and other contributors
66
* Released under the MIT license
77
* http://jquery.org/license
88
*
9-
* Date: 2014-01-31T16:40Z
9+
* Date: 2015-01-20T19:39Z
1010
*/
1111

1212
/** Font Family and Sizes */
@@ -62,21 +62,33 @@
6262
}
6363

6464
#qunit-testrunner-toolbar {
65-
padding: 0.5em 0 0.5em 2em;
65+
padding: 0.5em 1em 0.5em 1em;
6666
color: #5E740B;
6767
background-color: #EEE;
6868
overflow: hidden;
6969
}
7070

7171
#qunit-userAgent {
72-
padding: 0.5em 0 0.5em 2.5em;
72+
padding: 0.5em 1em 0.5em 1em;
7373
background-color: #2B81AF;
7474
color: #FFF;
7575
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
7676
}
7777

7878
#qunit-modulefilter-container {
7979
float: right;
80+
padding: 0.2em;
81+
}
82+
83+
.qunit-url-config {
84+
display: inline-block;
85+
padding: 0.1em;
86+
}
87+
88+
.qunit-filter {
89+
display: block;
90+
float: right;
91+
margin-left: 1em;
8092
}
8193

8294
/** Tests: Pass/Fail */
@@ -86,19 +98,35 @@
8698
}
8799

88100
#qunit-tests li {
89-
padding: 0.4em 0.5em 0.4em 2.5em;
101+
padding: 0.4em 1em 0.4em 1em;
90102
border-bottom: 1px solid #FFF;
91103
list-style-position: inside;
92104
}
93105

94-
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
106+
#qunit-tests > li {
107+
display: none;
108+
}
109+
110+
#qunit-tests li.running,
111+
#qunit-tests li.pass,
112+
#qunit-tests li.fail,
113+
#qunit-tests li.skipped {
114+
display: list-item;
115+
}
116+
117+
#qunit-tests.hidepass li.running,
118+
#qunit-tests.hidepass li.pass {
95119
display: none;
96120
}
97121

98122
#qunit-tests li strong {
99123
cursor: pointer;
100124
}
101125

126+
#qunit-tests li.skipped strong {
127+
cursor: default;
128+
}
129+
102130
#qunit-tests li a {
103131
padding: 0.5em;
104132
color: #C2CCD1;
@@ -211,11 +239,26 @@
211239

212240
#qunit-banner.qunit-fail { background-color: #EE5757; }
213241

242+
/*** Skipped tests */
243+
244+
#qunit-tests .skipped {
245+
background-color: #EBECE9;
246+
}
247+
248+
#qunit-tests .qunit-skipped-label {
249+
background-color: #F4FF77;
250+
display: inline-block;
251+
font-style: normal;
252+
color: #366097;
253+
line-height: 1.8em;
254+
padding: 0 0.5em;
255+
margin: -0.4em 0.4em -0.4em 0;
256+
}
214257

215258
/** Result */
216259

217260
#qunit-testresult {
218-
padding: 0.5em 0.5em 0.5em 2.5em;
261+
padding: 0.5em 1em 0.5em 1em;
219262

220263
color: #2B81AF;
221264
background-color: #D2E0E6;

0 commit comments

Comments
 (0)