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

Merge branch 'develop' into api-v3

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-02-29 16:39:31 +01:00
parent 03c3beba0e 7c5572608f
commit 0c700cc36d
71 changed files with 5612 additions and 8665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/gulp-tests.js
View File

@@ -12,14 +12,14 @@ import gulp from 'gulp';
import Q from 'q';
import runSequence from 'run-sequence';
import os from 'os';
import nconf from 'nconf';
// TODO rewrite
const TEST_SERVER_PORT = 3003
const TEST_DB = 'habitrpg_test'
let server;
const TEST_DB_URI = `mongodb://localhost/${TEST_DB}`
const TEST_DB_URI = nconf.get('TEST_DB_URI');
const API_V2_TEST_COMMAND = 'npm run test:api-v2:integration';
const API_V3_TEST_COMMAND = 'npm run test:api-v3';
@@ -54,7 +54,7 @@ gulp.task('test:nodemon', (done) => {
process.env.PORT = TEST_SERVER_PORT;
process.env.NODE_DB_URI=TEST_DB_URI;
runSequence('nodemon')
runSequence('nodemon');
});
gulp.task('test:prepare:mongo', (cb) => {