From dccf95a3c282b00133944feea4ee3c65f9261112 Mon Sep 17 00:00:00 2001 From: Nick Tomlin Date: Sun, 1 Mar 2015 08:39:11 -0600 Subject: [PATCH] Fix nconf path in api test --- test/api.mocha.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 7ffc8b0110..5fb7080448 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -8,13 +8,13 @@ async = require("async") diff = require("deep-diff") superagentDefaults = require("superagent-defaults") request = superagentDefaults() +path = require("path") moment = require("moment") conf = require("nconf") -conf.argv().env().file(file: __dirname + "../website/config.json").defaults() +conf.argv().env().file(file: path.join(__dirname, "../config.json")).defaults() conf.set "port", "1337" # Override normal ENV values with nconf ENV values (ENV values are used the same way without nconf) -# FIXME can't get nconf file above to load... process.env.BASE_URL = conf.get("BASE_URL") process.env.FACEBOOK_KEY = conf.get("FACEBOOK_KEY") process.env.FACEBOOK_SECRET = conf.get("FACEBOOK_SECRET")