Skip to content

Commit

Permalink
Fix config loading for unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
notheotherben committed Nov 21, 2013
1 parent 87d478b commit b9290c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -7,4 +7,4 @@ node_js:
services:
- mongodb
env:
- CI_SERVER="TRAVIS"
- CI_SERVER=1
4 changes: 2 additions & 2 deletions tests/common.js
Expand Up @@ -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"));
}
Expand Down

0 comments on commit b9290c8

Please sign in to comment.