krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +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-09 12:52:25 -06:00
parent 851631e465 6b7a757459
commit d6764d4f37
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -122,6 +122,7 @@
"protractor": "~2.5.1", "protractor": "~2.5.1",
"rewire": "^2.3.3", "rewire": "^2.3.3",
"rimraf": "^2.4.3", "rimraf": "^2.4.3",
"run-sequence": "^1.1.4",
"shelljs": "^0.4.0", "shelljs": "^0.4.0",
"sinon": "^1.17.2", "sinon": "^1.17.2",
"sinon-chai": "^2.8.0", "sinon-chai": "^2.8.0",

17
tasks/gulp-tests.js
View File

@@ -10,6 +10,7 @@ import { exec } from 'child_process';
import psTree from 'ps-tree'; import psTree from 'ps-tree';
import gulp from 'gulp'; import gulp from 'gulp';
import Q from 'q'; import Q from 'q';
import runSequence from 'run-sequence';
const TEST_SERVER_PORT = 3003 const TEST_SERVER_PORT = 3003
const TEST_DB = 'habitrpg_test' const TEST_DB = 'habitrpg_test'
@@ -368,17 +369,21 @@ gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => {
}); });
}); });
gulp.task('test', [ gulp.task('test:all', (done) => {
runSequence(
'lint', 'lint',
//'test:e2e:safe', // 'test:e2e:safe',
'test:common:safe', 'test:common:safe',
// 'test:content:safe', // 'test:content:safe',
'test:server_side:safe', 'test:server_side:safe',
//'test:karma:safe', // 'test:karma:safe',
//'test:api-legacy:safe', // 'test:api-legacy:safe',
//'test:api-v2:safe', // 'test:api-v2:safe',
'test:api-v3:safe', 'test:api-v3:safe',
], () => { done);
});
gulp.task('test', ['test:all'], () => {
let totals = [0,0,0]; let totals = [0,0,0];
console.log('\n\x1b[36m\x1b[4mHabitica Test Summary\x1b[0m\n'); console.log('\n\x1b[36m\x1b[4mHabitica Test Summary\x1b[0m\n');