krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'api-v3' into api-v3-user

Browse Source
This commit is contained in:
Blade Barringer
2015-11-21 09:43:58 -06:00
parent a54db44406 4dee29a20b
commit 4f6b765923
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/gulp-tests.js
View File

@@ -40,6 +40,13 @@ let testBin = (string, additionalEnvVariables = '') => {
return `NODE_ENV=testing ${additionalEnvVariables} ./node_modules/.bin/${string}`; return `NODE_ENV=testing ${additionalEnvVariables} ./node_modules/.bin/${string}`;
}; };
gulp.task('test:nodemon', (done) => {
process.env.PORT = TEST_SERVER_PORT;
process.env.NODE_DB_URI=TEST_DB_URI;
runSequence('nodemon')
});
gulp.task('test:prepare:mongo', (cb) => { gulp.task('test:prepare:mongo', (cb) => {
mongoose.connect(TEST_DB_URI, (err) => { mongoose.connect(TEST_DB_URI, (err) => {
if (err) return cb(`Unable to connect to mongo database. Are you sure it's running? \n\n${err}`); if (err) return cb(`Unable to connect to mongo database. Are you sure it's running? \n\n${err}`);

2
test/common/user.fns.ultimateGear.test.js
View File

@@ -2,7 +2,7 @@
let shared = require('../../common/script/index.js'); let shared = require('../../common/script/index.js');
shared.i18n.translations = require('../../website/src/libs/i18n.js').translations; shared.i18n.translations = require('../../website/src/libs/api-v2/i18n.js').translations;
require('./test_helper'); require('./test_helper');