Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2015-11-16 12:04:42 -06:00

View File

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