Skip to content

Commit 26e206b

Browse files
committed
Build: Get QUnit from Bower
1 parent 206bbf8 commit 26e206b

File tree

10 files changed

+2573
-13
lines changed

10 files changed

+2573
-13
lines changed

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
build/.sizecache.json
2-
dist/
3-
.DS_Store
4-
node_modules
51
.sizecache.json
2+
/bower_components
3+
/dist
4+
/node_modules

.gitmodules

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

Gruntfile.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var files = [
1010
"test/unit/*.js"
1111
];
1212

13-
grunt.loadNpmTasks( "grunt-update-submodules" );
13+
grunt.loadNpmTasks( "grunt-bowercopy" );
1414
grunt.loadNpmTasks( "grunt-compare-size" );
1515
grunt.loadNpmTasks( "grunt-git-authors" );
1616
grunt.loadNpmTasks( "grunt-contrib-qunit" );
@@ -20,6 +20,19 @@ grunt.loadNpmTasks( "grunt-contrib-jshint" );
2020
grunt.initConfig({
2121
pkg: grunt.file.readJSON( "package.json" ),
2222

23+
bowercopy: {
24+
all: {
25+
options: {
26+
destPrefix: "external"
27+
},
28+
files: {
29+
"qunit/qunit.js": "qunit/qunit/qunit.js",
30+
"qunit/qunit.css": "qunit/qunit/qunit.css",
31+
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt"
32+
}
33+
}
34+
},
35+
2336
jshint: {
2437
options: {
2538
jshintrc: true
@@ -126,7 +139,7 @@ grunt.registerTask( "manifest", function() {
126139
}, null, "\t" ) );
127140
});
128141

129-
grunt.registerTask( "default", ["jshint", "update_submodules", "qunit", "build", "compare_size"] );
142+
grunt.registerTask( "default", ["jshint", "qunit", "build", "compare_size"] );
130143
grunt.registerTask( "build", ["max", "uglify"] );
131144

132145
};

bower.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"name": "jquery-simulate",
3+
"devDependencies": {
4+
"qunit": "1.14.0"
5+
}
6+
}

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: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
/*!
2+
* QUnit 1.14.0
3+
* http://qunitjs.com/
4+
*
5+
* Copyright 2013 jQuery Foundation and other contributors
6+
* Released under the MIT license
7+
* http://jquery.org/license
8+
*
9+
* Date: 2014-01-31T16:40Z
10+
*/
11+
12+
/** Font Family and Sizes */
13+
14+
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
15+
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
16+
}
17+
18+
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
19+
#qunit-tests { font-size: smaller; }
20+
21+
22+
/** Resets */
23+
24+
#qunit-tests, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
25+
margin: 0;
26+
padding: 0;
27+
}
28+
29+
30+
/** Header */
31+
32+
#qunit-header {
33+
padding: 0.5em 0 0.5em 1em;
34+
35+
color: #8699A4;
36+
background-color: #0D3349;
37+
38+
font-size: 1.5em;
39+
line-height: 1em;
40+
font-weight: 400;
41+
42+
border-radius: 5px 5px 0 0;
43+
}
44+
45+
#qunit-header a {
46+
text-decoration: none;
47+
color: #C2CCD1;
48+
}
49+
50+
#qunit-header a:hover,
51+
#qunit-header a:focus {
52+
color: #FFF;
53+
}
54+
55+
#qunit-testrunner-toolbar label {
56+
display: inline-block;
57+
padding: 0 0.5em 0 0.1em;
58+
}
59+
60+
#qunit-banner {
61+
height: 5px;
62+
}
63+
64+
#qunit-testrunner-toolbar {
65+
padding: 0.5em 0 0.5em 2em;
66+
color: #5E740B;
67+
background-color: #EEE;
68+
overflow: hidden;
69+
}
70+
71+
#qunit-userAgent {
72+
padding: 0.5em 0 0.5em 2.5em;
73+
background-color: #2B81AF;
74+
color: #FFF;
75+
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
76+
}
77+
78+
#qunit-modulefilter-container {
79+
float: right;
80+
}
81+
82+
/** Tests: Pass/Fail */
83+
84+
#qunit-tests {
85+
list-style-position: inside;
86+
}
87+
88+
#qunit-tests li {
89+
padding: 0.4em 0.5em 0.4em 2.5em;
90+
border-bottom: 1px solid #FFF;
91+
list-style-position: inside;
92+
}
93+
94+
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running {
95+
display: none;
96+
}
97+
98+
#qunit-tests li strong {
99+
cursor: pointer;
100+
}
101+
102+
#qunit-tests li a {
103+
padding: 0.5em;
104+
color: #C2CCD1;
105+
text-decoration: none;
106+
}
107+
#qunit-tests li a:hover,
108+
#qunit-tests li a:focus {
109+
color: #000;
110+
}
111+
112+
#qunit-tests li .runtime {
113+
float: right;
114+
font-size: smaller;
115+
}
116+
117+
.qunit-assert-list {
118+
margin-top: 0.5em;
119+
padding: 0.5em;
120+
121+
background-color: #FFF;
122+
123+
border-radius: 5px;
124+
}
125+
126+
.qunit-collapsed {
127+
display: none;
128+
}
129+
130+
#qunit-tests table {
131+
border-collapse: collapse;
132+
margin-top: 0.2em;
133+
}
134+
135+
#qunit-tests th {
136+
text-align: right;
137+
vertical-align: top;
138+
padding: 0 0.5em 0 0;
139+
}
140+
141+
#qunit-tests td {
142+
vertical-align: top;
143+
}
144+
145+
#qunit-tests pre {
146+
margin: 0;
147+
white-space: pre-wrap;
148+
word-wrap: break-word;
149+
}
150+
151+
#qunit-tests del {
152+
background-color: #E0F2BE;
153+
color: #374E0C;
154+
text-decoration: none;
155+
}
156+
157+
#qunit-tests ins {
158+
background-color: #FFCACA;
159+
color: #500;
160+
text-decoration: none;
161+
}
162+
163+
/*** Test Counts */
164+
165+
#qunit-tests b.counts { color: #000; }
166+
#qunit-tests b.passed { color: #5E740B; }
167+
#qunit-tests b.failed { color: #710909; }
168+
169+
#qunit-tests li li {
170+
padding: 5px;
171+
background-color: #FFF;
172+
border-bottom: none;
173+
list-style-position: inside;
174+
}
175+
176+
/*** Passing Styles */
177+
178+
#qunit-tests li li.pass {
179+
color: #3C510C;
180+
background-color: #FFF;
181+
border-left: 10px solid #C6E746;
182+
}
183+
184+
#qunit-tests .pass { color: #528CE0; background-color: #D2E0E6; }
185+
#qunit-tests .pass .test-name { color: #366097; }
186+
187+
#qunit-tests .pass .test-actual,
188+
#qunit-tests .pass .test-expected { color: #999; }
189+
190+
#qunit-banner.qunit-pass { background-color: #C6E746; }
191+
192+
/*** Failing Styles */
193+
194+
#qunit-tests li li.fail {
195+
color: #710909;
196+
background-color: #FFF;
197+
border-left: 10px solid #EE5757;
198+
white-space: pre;
199+
}
200+
201+
#qunit-tests > li:last-child {
202+
border-radius: 0 0 5px 5px;
203+
}
204+
205+
#qunit-tests .fail { color: #000; background-color: #EE5757; }
206+
#qunit-tests .fail .test-name,
207+
#qunit-tests .fail .module-name { color: #000; }
208+
209+
#qunit-tests .fail .test-actual { color: #EE5757; }
210+
#qunit-tests .fail .test-expected { color: #008000; }
211+
212+
#qunit-banner.qunit-fail { background-color: #EE5757; }
213+
214+
215+
/** Result */
216+
217+
#qunit-testresult {
218+
padding: 0.5em 0.5em 0.5em 2.5em;
219+
220+
color: #2B81AF;
221+
background-color: #D2E0E6;
222+
223+
border-bottom: 1px solid #FFF;
224+
}
225+
#qunit-testresult .module-name {
226+
font-weight: 700;
227+
}
228+
229+
/** Fixture */
230+
231+
#qunit-fixture {
232+
position: absolute;
233+
top: -10000px;
234+
left: -10000px;
235+
width: 1000px;
236+
height: 1000px;
237+
}

0 commit comments

Comments
 (0)