From 66ca09b36de6f64c7ec75cbf1a5cd4e98b6a84cb Mon Sep 17 00:00:00 2001
From: Scott Tolksdorf <scott.tolksdorf@gmail.com>
Date: Fri, 6 Jan 2017 00:48:52 -0500
Subject: [PATCH] Both types of tests are now working

---
 server.js             | 18 ++++++++++++++++++
 server/brew.data.js   |  9 ---------
 server/db.js          |  7 ++++++-
 test/brew.apitest.js  | 13 ++++++++-----
 test/brew.datatest.js | 22 ++++------------------
 5 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/server.js b/server.js
index 0f48abe..4337acc 100644
--- a/server.js
+++ b/server.js
@@ -25,6 +25,24 @@ app.use(mw.admin);
 app.use(require('./server/brew.api.js'));
 app.use(require('./server/interface.routes.js'));
 
+setTimeout(()=>{
+	var test = require('./server/brew.data.js');
+
+	test.create({text : 'test'})
+		.then((brew) => {
+			console.log(brew);
+		})
+		.catch(console.log);
+
+	test.get({})
+	.then((brew) => {
+		console.log(brew);
+	})
+	.catch(console.log);
+
+
+}, 1000);
+
 
 //app.use(require('./server/admin.api.js'));
 
diff --git a/server/brew.data.js b/server/brew.data.js
index 8c5d166..becf788 100644
--- a/server/brew.data.js
+++ b/server/brew.data.js
@@ -84,15 +84,6 @@ const BrewData = {
 		const newBrew = new Brew(brew);
 
 		return newBrew.save();
-
-		//TODO: add error decorators to the catches
-		const temp = newBrew.save().then(()=>{
-			console.log('SAVED');
-		});
-
-		console.log(typeof temp, _.keys(temp), temp);
-
-		return temp;
 	},
 	update : (newBrew) => {
 		return Brew.findOneAndUpdate({ editId : newBrew.editId },
diff --git a/server/db.js b/server/db.js
index 452ce87..3e8a17b 100644
--- a/server/db.js
+++ b/server/db.js
@@ -6,13 +6,18 @@ const dbPath = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb:/
 module.exports = {
 	connect : ()=>{
 		return new Promise((resolve, reject)=>{
-			mongoose.createConnection(dbPath,
+			if(mongoose.connection.readyState == 1){
+				console.log('already connected');
+				return resolve();
+			}
+			mongoose.connect(dbPath,
 				(err) => {
 					if(err){
 						console.log('Error : Could not connect to a Mongo Database.');
 						console.log('        If you are running locally, make sure mongodb.exe is running.');
 						return reject(err);
 					}
+					console.log('mongo connected.');
 					return resolve();
 				}
 			);
diff --git a/test/brew.apitest.js b/test/brew.apitest.js
index cc612da..bcadf0b 100644
--- a/test/brew.apitest.js
+++ b/test/brew.apitest.js
@@ -1,15 +1,14 @@
-
+const should = require('chai').use(require('chai-as-promised')).should();
 const request = require('supertest-as-promised');
 const app = require('../server.js');
 
 
 const apiPath = '/api/brew';
 
-describe('/api/brew', () => {
 
+describe(apiPath, () => {
 
 	describe('POST', () => {
-
 		it('creates a new brew', () => {
 			return request(app)
 				.post(apiPath)
@@ -18,8 +17,12 @@ describe('/api/brew', () => {
 				})
 				.expect(200)
 				.then((res) => {
-					console.log(res.body);
-				});
+					const brew = res.body;
+					should.exist(brew);
+					brew.should.have.property('editId').that.is.a('string');
+					brew.should.have.property('shareId').that.is.a('string');
+					brew.should.have.property('text').that.is.a('string');
+				})
 		});
 
 	});
diff --git a/test/brew.datatest.js b/test/brew.datatest.js
index 487cc93..cd4b9fc 100644
--- a/test/brew.datatest.js
+++ b/test/brew.datatest.js
@@ -1,38 +1,24 @@
-
 const should = require('chai').use(require('chai-as-promised')).should();
 
 const BrewDB = require('../server/db.js');
 const BrewData = require('../server/brew.data.js');
 
 
-describe.skip('BrewDB', () => {
-
+describe('BrewDB', () => {
 	before('Await DB', ()=>{
-		return BrewDB.connect()
-			.then(()=>{
-				console.log('connected');
-			})
-			.catch(()=>{
-				console.log('sdfdsfdsfdsf');
-			})
+		return BrewDB.connect().catch()
 	});
 
-	it('generates ID on save', (done) => {
-		console.log('getting here');
+	it('generates ID on save', () => {
 		return BrewData.create({
 			text : "Brew Text"
 		}).then((brew) => {
-			console.log('here2');
 			should.exist(brew);
 			brew.should.have.property('editId').that.is.a('string');
 			brew.should.have.property('shareId').that.is.a('string');
 			brew.should.have.property('text').that.is.a('string');
-			console.log('and I am done');
-			done();
-		})
-		.catch((e) => {
-			console.log('an error', e);
 		})
+
 	});
 
 });
\ No newline at end of file