Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

tests use regular config file

  • Loading branch information...
commit 42387ab4b6096254096644f515f7ff1fe999d49c 1 parent 1d413b8
@cooperq cooperq authored
View
1  .travis.yml
@@ -10,4 +10,5 @@ notifications:
- ted@radicaldesigns.org
- cooperq@cooperq.com
before_script:
+ - cp examples/config.js config.js
- mysql -uroot < examples/db.sql
View
5 app.js
@@ -1,9 +1,6 @@
var config, server;
-if(process.env.NODE_ENV == 'test'){
- console.log('starting Ethersheet in test mode');
- config = require('./lib/test/config-test');
-} else if(process.env.CONFIG_PATH){
+if(process.env.CONFIG_PATH){
config = require(process.env.CONFIG_PATH);
} else {
config = require('./config');
View
9 test/config-test.js
@@ -1,9 +0,0 @@
-module.exports = {
- port: 8080,
- https_key: './examples/snakeoil.key',
- https_cert: './examples/snakeoil.crt',
- mysql_database: 'ethersheet',
- mysql_user: 'ethersheet',
- mysql_password: 'ethersheet',
- mysql_host: 'localhost'
-}
View
2  test/unit/ethersheet.js
@@ -1,6 +1,6 @@
var EtherSheetService = require('../../lib/ethersheet').EtherSheetService;
var _ = require('underscore');
-var config = require('../config-test.js');
+var config = require('../../config.js');
var should = require('chai').should();
describe('EtherSheetService', function(){
Please sign in to comment.
Something went wrong with that request. Please try again.