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' of github.com:HabitRPG/habitrpg into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-03-02 12:59:51 +01:00
parent 9114d74357 5b012750bb
commit 8920b05f9e
97 changed files with 14671 additions and 17976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tasks/gulp-tests.js
View File

@@ -139,7 +139,7 @@ gulp.task('test:content:clean', (cb) => {
});
gulp.task('test:content:watch', ['test:content:clean'], () => {
gulp.watch(['common/script/src/content/**', 'test/**'], ['test:content:clean']);
gulp.watch(['common/script/content/**', 'test/**'], ['test:content:clean']);
});
gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
@@ -429,13 +429,13 @@ gulp.task('test:api-v3:safe', ['test:prepare:server'], (done) => {
gulp.task('test:all', (done) => {
runSequence(
'lint',
// 'test:e2e:safe',
//'test:e2e:safe',
//'test:common:safe',
// 'test:content:safe',
//'test:server_side:safe',
// 'test:karma:safe',
// 'test:api-legacy:safe',
// 'test:api-v2:safe',
//'test:content:safe',
// 'test:server_side:safe',
//'test:karma:safe',
//'test:api-legacy:safe',
//'test:api-v2:safe',
'test:api-v3:safe',
done);
});