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:
Matteo Pagliazzi
2016-03-15 19:23:23 +01:00
parent 9a337ad15f fdeddc8631
commit 3db06c6537
9 changed files with 126 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tasks/gulp-tests.js
View File

@@ -272,9 +272,6 @@ gulp.task('test:e2e', ['test:prepare', 'test:prepare:server'], (cb) => {
let runner = exec(
'npm run test:e2e',
(err, stdout, stderr) => {
/*
* Note: As it stands, protractor wont report pending specs
*/
support.forEach(kill);
cb(err);
}
@@ -296,15 +293,13 @@ gulp.task('test:e2e:safe', ['test:prepare', 'test:prepare:server'], (cb) => {
let runner = exec(
'npm run test:e2e',
(err, stdout, stderr) => {
/*
* Note: As it stands, protractor wont report pending specs
*/
let match = stdout.match(/(\d+) tests?.*(\d) failures?/);
testResults.push({
suite: 'End-to-End Specs',
pass: parseInt(match[1]) - parseInt(match[2]),
fail: parseInt(match[2]),
pend: 0
suite: 'End-to-End Specs\t',
pass: testCount(stdout, /(\d+) passing/),
fail: testCount(stdout, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/)
});
support.forEach(kill);
cb();