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

djusted paths

Browse Source
This commit is contained in:
Blade Barringer
2015-02-03 21:43:10 -06:00
parent 9b8f006064
commit cac788e7db
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/api.mocha.coffee
View File

@@ -10,7 +10,7 @@ superagentDefaults = require("superagent-defaults")
request = superagentDefaults() request = superagentDefaults()
moment = require("moment") moment = require("moment")
conf = require("nconf") conf = require("nconf")
conf.argv().env().file(file: __dirname + "../config.json").defaults() conf.argv().env().file(file: __dirname + "../website/config.json").defaults()
conf.set "port", "1337" conf.set "port", "1337"
# Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf) # Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf)
@@ -19,12 +19,12 @@ process.env.BASE_URL = conf.get("BASE_URL")
process.env.FACEBOOK_KEY = conf.get("FACEBOOK_KEY") process.env.FACEBOOK_KEY = conf.get("FACEBOOK_KEY")
process.env.FACEBOOK_SECRET = conf.get("FACEBOOK_SECRET") process.env.FACEBOOK_SECRET = conf.get("FACEBOOK_SECRET")
process.env.NODE_DB_URI = "mongodb://localhost/habitrpg" process.env.NODE_DB_URI = "mongodb://localhost/habitrpg"
User = require("../src/models/user").model User = require("../website/src/models/user").model
Group = require("../src/models/group").model Group = require("../website/src/models/group").model
Challenge = require("../src/models/challenge").model Challenge = require("../website/src/models/challenge").model
app = require("../src/server") app = require("../website/src/server")
shared = require("../common") shared = require("../common")
payments = require("../src/controllers/payments") payments = require("../website/src/controllers/payments")
# ###### Helpers & Variables ###### # ###### Helpers & Variables ######
model = undefined model = undefined
@@ -64,7 +64,7 @@ describe "API", ->
cb null, res.body cb null, res.body
before (done) -> before (done) ->
require "../src/server" # start the server require "../website/src/server" # start the server
# then wait for it to do it's thing. TODO make a cb-compatible export of server # then wait for it to do it's thing. TODO make a cb-compatible export of server
setTimeout done, 2000 setTimeout done, 2000

2
test/run_tests.sh
View File

@@ -30,7 +30,7 @@ if [ -z "$TRAVIS" ]; then
done done
fi fi
NODE_DB_URI="$TEST_DB_URI" PORT=$TEST_SERVER_PORT node ./src/server.js > /dev/null & NODE_DB_URI="$TEST_DB_URI" PORT=$TEST_SERVER_PORT node ./website/src/server.js > /dev/null &
NODE_PID=$! NODE_PID=$!
trap "kill $NODE_PID" EXIT trap "kill $NODE_PID" EXIT