Added config to project

Author: Jrschellenberg

config/development.json

@@ -0,0 +1,3 @@
+{
+  "DBHost": "mongodb://localhost:27017/TeamTreeHouseProject11"
+}

config/production.json

@@ -0,0 +1,3 @@
+{
+  "DBHost": "mongodb://mongo:27017/TeamTreeHouseProject11"
+}

config/test.json

@@ -0,0 +1,3 @@
+{
+  "DBHost": "mongodb://localhost:27017/TeamTreeHouseProject11Test"
+}

package-lock.json

@@ -6,8 +6,8 @@
   "scripts": {
     "babel-node": "babel-node --presets=es2015",
     "nodemon": "nodemon -e pug,js,css --exec npm run babel-node -- src/bin/www",
-    "start": "npm run nodemon",
-    "test": "mocha --compilers js:babel-register --recursive ./test/"
+    "start": "SET NODE_ENV=dev && npm run nodemon",
+    "test": "mocha --timeout 10000 --compilers js:babel-register --recursive ./test/"
   },
   "author": "",
   "license": "ISC",
@@ -24,6 +24,7 @@
   "dependencies": {
     "bcrypt": "^1.0.3",
     "body-parser": "~1.18.2",
+    "config": "^1.30.0",
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.9",
     "express": "~4.15.5",

package.json

@@ -11,21 +11,24 @@ const User = require('./models/user');
 const Course = require('./models/course');
 const Review = require('./models/review');
 
+console.log(process.env.NODE_ENV);
+const config = require('config');
+const dbConfig = config.get('DBHost');
+
+console.log(dbConfig);
+
 
 const index = require('./routes/index');
 const app = express();
 
-const dbName = 'TeamTreeHouseProject11';
-
-const env = process.env.NODE_ENV || 'dev';
+//const env = process.env.NODE_ENV || 'dev';
 
 //mongoDb Connection
-if(env ==='dev' || env ==='development'){
-	mongoose.connect('mongodb://localhost:27017/'+dbName );
-}
-else{
-	mongoose.connect('mongodb://mongo:27017/'+dbName);
-}
+mongoose.connect(dbConfig);
+
+
+
+
 const db = mongoose.connection;
 db.on('error', console.error.bind(console, 'connection error:'));
 
@@ -35,7 +38,7 @@ db.on('connected', function() {
 
 
 
-	seeder.connect('mongodb://localhost:27017/'+dbName, function(){
+	seeder.connect(dbConfig, function(){
 		// Load Mongoose models
 		seeder.loadModels([
 			'./src/models/user',
@@ -62,7 +65,10 @@ app.set('view engine', 'pug');
 
 // uncomment after placing your favicon in /public
 //app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
-app.use(logger('dev'));
+
+if(config.util.getEnv('NODE_ENV') !== 'test') {
+	app.use(logger('dev'));
+}
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
 app.use(cookieParser());

src/app.js

@@ -1,9 +1,18 @@
 'use strict';
+process.env.NODE_ENV = 'test';
+
 
 import { expect } from 'chai'
 
+
+
 describe('test', function () {
 	it('should pass', function () {
 		expect('string').to.be.a('string')
 	});
+	
+	
+	it('should set NODE_ENV to equal test', () => {
+		expect(process.env.NODE_ENV).to.be.equal('test');
+	});
 });