From b9290c849baad1771bf4bd3e378dabd9a171e3ce Mon Sep 17 00:00:00 2001
From: Benjamin Pannell <admin@sierrasoftworks.com>
Date: Thu, 21 Nov 2013 04:25:16 +0200
Subject: [PATCH] Fix config loading for unit tests

---
 .travis.yml     | 2 +-
 tests/common.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bf54877..8a6bd3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ node_js:
 services:
  - mongodb
 env:
- - CI_SERVER="TRAVIS"
\ No newline at end of file
+ - CI_SERVER=1
\ No newline at end of file
diff --git a/tests/common.js b/tests/common.js
index d366482..b6d6b8d 100644
--- a/tests/common.js
+++ b/tests/common.js
@@ -31,11 +31,11 @@ var config = null;
 
 module.exports.getConfig = function () {
 	if (module.exports.isCI()) {
-		return config || (config = module.exports.extend(require('../settings'), {
+		return config || {
 			user: "iridium",
 			password: "",
 			database: "iridium"
-		}));
+		};
 	} else {
 		return config || (config = require("./config"));
 	}