Skip to content

Commit 1a944fa

Browse files
afc163afc163
committed
update to mocha@1.18.2
1 parent 7343e62 commit 1a944fa

File tree

7 files changed

+1178
-479
lines changed

7 files changed

+1178
-479
lines changed

‎mocha/Gruntfile.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ module.exports = function(grunt) {
2525
}
2626
},
2727
cssmin: {
28-
css: {
28+
src: {
2929
files: {
3030
'dist/mocha.css': ['dist/mocha-debug.css']
3131
}
3232
}
3333
}
3434
});
3535

36-
require('grunt-spm-build').initConfig(grunt, {pkg: pkg});
37-
grunt.loadGlobalTasks('grunt-spm-build');
36+
grunt.loadGlobalTasks('spm-build');
37+
grunt.util._.merge(grunt.config.data, require('spm-build').config);
3838

3939
grunt.loadTasks('../_tasks/download/tasks');
40-
grunt.registerTask('build', ['download', 'uglify', 'cssmin', 'newline']);
40+
grunt.registerTask('build', ['download', 'cssmin:src', 'uglify:src', 'spm-newline']);
4141
};

‎mocha/README.md

Lines changed: 173 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,173 @@
1+
[![Build Status](https://secure.travis-ci.org/visionmedia/mocha.png)](http://travis-ci.org/visionmedia/mocha)
2+
3+
[![Mocha test framework](http://f.cl.ly/items/3l1k0n2A1U3M1I1L210p/Screen%20Shot%202012-02-24%20at%202.21.43%20PM.png)](http://visionmedia.github.io/mocha)
4+
5+
Mocha is a simple, flexible, fun JavaScript test framework for node.js and the browser. For more information view the [documentation](http://visionmedia.github.io/mocha).
6+
7+
## Contributors
8+
9+
```
10+
11+
project : mocha
12+
repo age : 2 years, 4 months ago
13+
commits : 1314
14+
active : 372 days
15+
files : 141
16+
authors :
17+
582 TJ Holowaychuk 44.3%
18+
389 Tj Holowaychuk 29.6%
19+
46 Travis Jeffery 3.5%
20+
31 Guillermo Rauch 2.4%
21+
13 Attila Domokos 1.0%
22+
10 John Firebaugh 0.8%
23+
8 Jo Liss 0.6%
24+
7 Nathan Rajlich 0.5%
25+
6 Mike Pennisi 0.5%
26+
6 James Carr 0.5%
27+
6 Brendan Nee 0.5%
28+
5 Aaron Heckmann 0.4%
29+
5 Ryunosuke SATO 0.4%
30+
4 hokaccha 0.3%
31+
4 Joshua Krall 0.3%
32+
4 Xavier Antoviaque 0.3%
33+
3 Jesse Dailey 0.2%
34+
3 Forbes Lindesay 0.2%
35+
3 Sindre Sorhus 0.2%
36+
3 Cory Thomas 0.2%
37+
3 Fredrik Enestad 0.2%
38+
3 Ben Lindsey 0.2%
39+
3 Tyson Tate 0.2%
40+
3 Mathieu Desvé 0.2%
41+
3 Valentin Agachi 0.2%
42+
3 Wil Moore III 0.2%
43+
3 Merrick Christensen 0.2%
44+
3 eiji.ienaga 0.2%
45+
3 fool2fish 0.2%
46+
3 Nathan Bowser 0.2%
47+
3 Paul Miller 0.2%
48+
2 Juzer Ali 0.2%
49+
2 Pete Hawkins 0.2%
50+
2 Jonas Westerlund 0.2%
51+
2 Arian Stolwijk 0.2%
52+
2 Quang Van 0.2%
53+
2 Glen Mailer 0.2%
54+
2 Justin DuJardin 0.2%
55+
2 FARKAS Máté 0.2%
56+
2 Raynos 0.2%
57+
2 Michael Riley 0.2%
58+
2 Michael Schoonmaker 0.2%
59+
2 Domenic Denicola 0.2%
60+
2 Simon Gaeremynck 0.2%
61+
2 Konstantin Käfer 0.2%
62+
2 domenic 0.2%
63+
2 Paul Armstrong 0.2%
64+
2 fcrisci 0.2%
65+
2 Alexander Early 0.2%
66+
2 Shawn Krisman 0.2%
67+
2 Brian Beck 0.2%
68+
2 Nathan Alderson 0.2%
69+
2 David Henderson 0.2%
70+
2 Timo Tijhof 0.2%
71+
2 Ian Storm Taylor 0.2%
72+
2 travis jeffery 0.2%
73+
1 Matt Smith 0.1%
74+
1 Matthew Shanley 0.1%
75+
1 Nathan Black 0.1%
76+
1 Phil Sung 0.1%
77+
1 R56 0.1%
78+
1 Refael Ackermann 0.1%
79+
1 Richard Dingwall 0.1%
80+
1 Romain Prieto 0.1%
81+
1 Roman Neuhauser 0.1%
82+
1 Roman Shtylman 0.1%
83+
1 Russ Bradberry 0.1%
84+
1 Russell Munson 0.1%
85+
1 Rustem Mustafin 0.1%
86+
1 Salehen Shovon Rahman 0.1%
87+
1 Sasha Koss 0.1%
88+
1 Seiya Konno 0.1%
89+
1 Simon Goumaz 0.1%
90+
1 Standa Opichal 0.1%
91+
1 Stephen Mathieson 0.1%
92+
1 Steve Mason 0.1%
93+
1 Tapiwa Kelvin 0.1%
94+
1 Teddy Zeenny 0.1%
95+
1 Tim Ehat 0.1%
96+
1 Vadim Nikitin 0.1%
97+
1 Victor Costan 0.1%
98+
1 Will Langstroth 0.1%
99+
1 Yanis Wang 0.1%
100+
1 Yuest Wang 0.1%
101+
1 abrkn 0.1%
102+
1 airportyh 0.1%
103+
1 badunk 0.1%
104+
1 fengmk2 0.1%
105+
1 grasGendarme 0.1%
106+
1 lodr 0.1%
107+
1 tgautier@yahoo.com 0.1%
108+
1 traleig1 0.1%
109+
1 vlad 0.1%
110+
1 yuitest 0.1%
111+
1 Adam Crabtree 0.1%
112+
1 Andreas Brekken 0.1%
113+
1 Andreas Lind Petersen 0.1%
114+
1 Andrew Nesbitt 0.1%
115+
1 Andrey Popp 0.1%
116+
1 Arnaud Brousseau 0.1%
117+
1 Atsuya Takagi 0.1%
118+
1 Austin Birch 0.1%
119+
1 Bjørge Næss 0.1%
120+
1 Brian Lalor 0.1%
121+
1 Brian M. Carlson 0.1%
122+
1 Brian Moore 0.1%
123+
1 Bryan Donovan 0.1%
124+
1 Casey Foster 0.1%
125+
1 ChrisWren 0.1%
126+
1 Corey Butler 0.1%
127+
1 Daniel Stockman 0.1%
128+
1 Dave McKenna 0.1%
129+
1 Di Wu 0.1%
130+
1 Dmitry Shirokov 0.1%
131+
1 Fedor Indutny 0.1%
132+
1 Florian Margaine 0.1%
133+
1 Frederico Silva 0.1%
134+
1 Fredrik Lindin 0.1%
135+
1 Gareth Murphy 0.1%
136+
1 Gavin Mogan 0.1%
137+
1 Glen Huang 0.1%
138+
1 Greg Perkins 0.1%
139+
1 Harry Brundage 0.1%
140+
1 Herman Junge 0.1%
141+
1 Ian Young 0.1%
142+
1 Ivan 0.1%
143+
1 JP Bochi 0.1%
144+
1 Jaakko Salonen 0.1%
145+
1 Jakub NesÌŒetrÌŒil 0.1%
146+
1 James Bowes 0.1%
147+
1 James Lal 0.1%
148+
1 Jason Barry 0.1%
149+
1 Javier Aranda 0.1%
150+
1 Jeff Kunkle 0.1%
151+
1 Jeremy Martin 0.1%
152+
1 Jimmy Cuadra 0.1%
153+
1 Jonathan Creamer 0.1%
154+
1 Jussi Virtanen 0.1%
155+
1 Katie Gengler 0.1%
156+
1 Kazuhito Hokamura 0.1%
157+
1 Kirill Korolyov 0.1%
158+
1 Koen Punt 0.1%
159+
1 Laszlo Bacsi 0.1%
160+
1 Liam Newman 0.1%
161+
1 László Bácsi 0.1%
162+
1 Maciej Małecki 0.1%
163+
1 Mal Graty 0.1%
164+
1 Marc Kuo 0.1%
165+
1 Matt Robenolt 0.1%
166+
```
167+
168+
## Links
169+
170+
- [Google Group](http://groups.google.com/group/mochajs)
171+
- [Wiki](https://github.com/visionmedia/mocha/wiki)
172+
- Mocha [Extensions and reporters](https://github.com/visionmedia/mocha/wiki)
173+

‎mocha/dist/mocha-debug.css

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
@charset "utf-8";
22

33
body {
4+
margin:0;
5+
}
6+
7+
#mocha {
48
font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
5-
padding: 60px 50px;
9+
margin: 60px 50px;
610
}
711

8-
#mocha ul, #mocha li {
12+
#mocha ul,
13+
#mocha li {
914
margin: 0;
1015
padding: 0;
1116
}
@@ -14,7 +19,8 @@ body {
1419
list-style: none;
1520
}
1621

17-
#mocha h1, #mocha h2 {
22+
#mocha h1,
23+
#mocha h2 {
1824
margin: 0;
1925
}
2026

@@ -38,7 +44,7 @@ body {
3844
font-size: .8em;
3945
}
4046

41-
.hidden {
47+
#mocha .hidden {
4248
display: none;
4349
}
4450

@@ -59,15 +65,15 @@ body {
5965

6066
#mocha .test.pending:hover h2::after {
6167
content: '(pending)';
62-
font-family: arial;
68+
font-family: arial, sans-serif;
6369
}
6470

6571
#mocha .test.pass.medium .duration {
66-
background: #C09853;
72+
background: #c09853;
6773
}
6874

6975
#mocha .test.pass.slow .duration {
70-
background: #B94A48;
76+
background: #b94a48;
7177
}
7278

7379
#mocha .test.pass::before {
@@ -83,7 +89,7 @@ body {
8389
font-size: 9px;
8490
margin-left: 5px;
8591
padding: 2px 5px;
86-
color: white;
92+
color: #fff;
8793
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
8894
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
8995
box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
@@ -130,6 +136,11 @@ body {
130136
overflow: auto;
131137
}
132138

139+
/**
140+
* (1): approximate for browsers not supporting calc
141+
* (2): 42 = 2*15 + 2*10 + 2*1 (padding + margin + border)
142+
* ^^ seriously
143+
*/
133144
#mocha .test pre {
134145
display: block;
135146
float: left;
@@ -138,11 +149,15 @@ body {
138149
margin: 5px;
139150
padding: 15px;
140151
border: 1px solid #eee;
152+
max-width: 85%; /*(1)*/
153+
max-width: calc(100% - 42px); /*(2)*/
154+
word-wrap: break-word;
141155
border-bottom-color: #ddd;
142156
-webkit-border-radius: 3px;
143157
-webkit-box-shadow: 0 1px 3px #eee;
144158
-moz-border-radius: 3px;
145159
-moz-box-shadow: 0 1px 3px #eee;
160+
border-radius: 3px;
146161
}
147162

148163
#mocha .test h2 {
@@ -183,9 +198,17 @@ body {
183198
display: none;
184199
}
185200

201+
#mocha-report.pending .test.pass,
202+
#mocha-report.pending .test.fail {
203+
display: none;
204+
}
205+
#mocha-report.pending .test.pass.pending {
206+
display: block;
207+
}
208+
186209
#mocha-error {
187210
color: #c00;
188-
font-size: 1.5 em;
211+
font-size: 1.5em;
189212
font-weight: 100;
190213
letter-spacing: 1px;
191214
}
@@ -197,6 +220,7 @@ body {
197220
font-size: 12px;
198221
margin: 0;
199222
color: #888;
223+
z-index: 1;
200224
}
201225

202226
#mocha-stats .progress {
@@ -229,18 +253,18 @@ body {
229253
height: 40px;
230254
}
231255

232-
code .comment { color: #ddd }
233-
code .init { color: #2F6FAD }
234-
code .string { color: #5890AD }
235-
code .keyword { color: #8A6343 }
236-
code .number { color: #2F6FAD }
256+
#mocha code .comment { color: #ddd; }
257+
#mocha code .init { color: #2f6fad; }
258+
#mocha code .string { color: #5890ad; }
259+
#mocha code .keyword { color: #8a6343; }
260+
#mocha code .number { color: #2f6fad; }
237261

238262
@media screen and (max-device-width: 480px) {
239-
body {
240-
padding: 60px 0px;
263+
#mocha {
264+
margin: 60px 0px;
241265
}
242266

243-
#stats {
267+
#mocha #stats {
244268
position: absolute;
245269
}
246270
}

0 commit comments

Comments
 (0)