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

Fix test callbacks; deliberately break a test for Travis

Browse Source
This commit is contained in:
Kevin Gisi
2015-06-09 12:39:23 -04:00
parent b1e8f16639
commit 5f218680bc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tasks/gulp-tests.js
View File

@@ -54,7 +54,7 @@ gulp.task('test:common', ['test:prepare:build'], (cb) => {
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stderr, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
cb(); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -71,7 +71,7 @@ gulp.task('test:api', ['test:prepare:mongo'], (cb) => {
fail: testCount(stderr, /(\d+) failing/), fail: testCount(stderr, /(\d+) failing/),
pend: testCount(stdout, /(\d+) pending/) pend: testCount(stdout, /(\d+) pending/)
}); });
cb(); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -87,7 +87,7 @@ gulp.task('test:karma', ['test:prepare:build'], (cb) => {
fail: testCount(stdout, /(\d+) tests failed/), fail: testCount(stdout, /(\d+) tests failed/),
pend: testCount(stdout, /(\d+) tests skipped/) pend: testCount(stdout, /(\d+) tests skipped/)
}); });
cb(); cb(err);
} }
); );
pipe(runner); pipe(runner);
@@ -118,7 +118,7 @@ gulp.task('test:e2e', ['test:prepare'], (cb) => {
pend: 0 pend: 0
}); });
support.forEach(kill); support.forEach(kill);
cb(); cb(err);
} }
); );
pipe(runner); pipe(runner);

2
test/common/algos.mocha.coffee
View File

@@ -992,7 +992,7 @@ describe 'Helper', ->
it 'counts mounts', -> it 'counts mounts', ->
mounts = {} mounts = {}
expect(shared.countMounts(null, mounts)).to.eql 0 expect(shared.countMounts(null, mounts)).to.eql 0
expect(shared.countMounts(1, mounts)).to.eql 1 expect(shared.countMounts(1, mounts)).to.eql 5
mounts = { "Dragon-Red": true, "Wolf-Base": true } mounts = { "Dragon-Red": true, "Wolf-Base": true }
expect(shared.countMounts(null, mounts)).to.eql 2 expect(shared.countMounts(null, mounts)).to.eql 2