krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Blade Barringer
2015-11-16 12:04:42 -06:00
parent 30eed12903 7a865b5c2a
commit 086e1da0e1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/gulp-tests.js
View File

@@ -97,7 +97,7 @@ gulp.task('test:common:safe', ['test:prepare:build'], (cb) => {
testResults.push({ testResults.push({
suite: 'Common Specs\t', suite: 'Common Specs\t',
pass: testCount(stdout, /(\d+) passing/), pass: testCount(stdout, /(\d+) passing/),
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stdout, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
cb(); cb();
@@ -133,7 +133,7 @@ gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
testResults.push({ testResults.push({
suite: 'Content Specs\t', suite: 'Content Specs\t',
pass: testCount(stdout, /(\d+) passing/), pass: testCount(stdout, /(\d+) passing/),
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stdout, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
cb(); cb();
@@ -159,7 +159,7 @@ gulp.task('test:server_side:safe', ['test:prepare:build'], (cb) => {
testResults.push({ testResults.push({
suite: 'Server Side Specs', suite: 'Server Side Specs',
pass: testCount(stdout, /(\d+) passing/), pass: testCount(stdout, /(\d+) passing/),
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stdout, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
cb(); cb();
@@ -185,7 +185,7 @@ gulp.task('test:api-legacy:safe', ['test:prepare:mongo'], (cb) => {
testResults.push({ testResults.push({
suite: 'API (legacy) Specs', suite: 'API (legacy) Specs',
pass: testCount(stdout, /(\d+) passing/), pass: testCount(stdout, /(\d+) passing/),
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stdout, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
cb(); cb();
@@ -359,7 +359,7 @@ gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => {
testResults.push({ testResults.push({
suite: 'API V3 Specs\t', suite: 'API V3 Specs\t',
pass: testCount(stdout, /(\d+) passing/), pass: testCount(stdout, /(\d+) passing/),
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stdout, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
done(); done();