Merge pull request #15 from abianco3/test/init

set up initially testing specs
Sophisticated-Seahorses · Mar 30, 2017 · 32d1634 · 32d1634
2 parents 1a29fb9 + d0c8c59
commit 32d1634
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 98 deletions.
diff --git a/database-mongo/index.js b/database-mongo/index.js
@@ -9,98 +9,4 @@ db.once('open', function() {
   console.log("Connected to MongoDB!");
 });
 
-var EventSchema = mongoose.Schema({
-	username: String,
-	description: String,
-	start: String,
-	end: String,
-	location: String,
-	phone: String,
-	address: String,
-	latitude: Number,
-	longitude: Number,
-});
-
-var Event = mongoose.model('Event', EventSchema);
-
-var UserSchema = mongoose.Schema({
-	userId: String,  
-	token: String,
-	firstname: String,
-	lastname: String,
-	email: String
-});
-
-var User = mongoose.model('User', UserSchema);
-
-var createUser = function(obj, callback) {
-	User.create(obj, function(err, user) {
-		if (err) {
-			callback(err, null);
-		} else {
-			callback(null, user);
-			console.log(user)
-		}
-	});
-};
-
-var findUser = function(userId, callback) {
-	User.find({userId: userId}, function(err, user) {
-		if (err) {
-			callback(err, null);
-		} else {
-			callback(null, user);
-		}
-	})
-}
-
-var selectAll = function(callback) {
-	Event.find({}, function(err, events) {
-		if (err) {
-			callback(err, null);
-		} else {
-			callback(null, events)
-		}
-	});
-};
-
-var createEvent = function(obj, callback) {
-	Event.create(obj, function(err, events) {
-		if (err) {
-			callback(err, null);
-		} else {
-			console.log('CREATE --->', events)
-			callback(null, events);
-		}
-	});
-};
-
-var updateEvent = function(id, newInfo, callback) {
-	Event.update(id, newInfo, function(err, events) {
-		if (err) {
-			callback(err, null);
-		} else {
-			console.log('UPDATE --->', events)
-			callback(null, events);
-		}
-	});
-};
-
-var removeEvent = function(obj, callback) {
-	Event.remove(obj, function(err, events) {
-		if (err) {
-			callback(err, null);
-		} else {
-			console.log('---> EVENT REMOVED!')
-			callback(null, events);
-		}
-	})
-};
-
-module.exports.Event = Event;
-module.exports.selectAll = selectAll;
-module.exports.createUser = createUser;
-module.exports.createEvent = createEvent;
-module.exports.removeEvent = removeEvent;
-module.exports.updateEvent = updateEvent;
-module.exports.findUser = findUser;
+module.exports = db;
diff --git a/database-mongo/models.js b/database-mongo/models.js
@@ -0,0 +1,98 @@
+var mongoose = require('mongoose');
+var connection = require('./index');
+
+var EventSchema = mongoose.Schema({
+  username: String,
+  description: String,
+  start: String,
+  end: String,
+  location: String,
+  phone: String,
+  address: String,
+  latitude: Number,
+  longitude: Number,
+});
+
+var Event = mongoose.model('Event', EventSchema);
+
+var UserSchema = mongoose.Schema({
+  userId: String,  
+  token: String,
+  firstname: String,
+  lastname: String,
+  email: String
+});
+
+var User = mongoose.model('User', UserSchema);
+
+var createUser = function(obj, callback) {
+  User.create(obj, function(err, user) {
+    if (err) {
+      callback(err, null);
+    } else {
+      callback(null, user);
+      console.log(user)
+    }
+  });
+};
+
+var findUser = function(userId, callback) {
+  User.find({userId: userId}, function(err, user) {
+    if (err) {
+      callback(err, null);
+    } else {
+      callback(null, user);
+    }
+  })
+}
+
+var selectAll = function(callback) {
+  Event.find({}, function(err, events) {
+    if (err) {
+      callback(err, null);
+    } else {
+      callback(null, events)
+    }
+  });
+};
+
+var createEvent = function(obj, callback) {
+  Event.create(obj, function(err, events) {
+    if (err) {
+      callback(err, null);
+    } else {
+      console.log('CREATE --->', events)
+      callback(null, events);
+    }
+  });
+};
+
+var updateEvent = function(id, newInfo, callback) {
+  Event.update(id, newInfo, function(err, events) {
+    if (err) {
+      callback(err, null);
+    } else {
+      console.log('UPDATE --->', events)
+      callback(null, events);
+    }
+  });
+};
+
+var removeEvent = function(obj, callback) {
+  Event.remove(obj, function(err, events) {
+    if (err) {
+      callback(err, null);
+    } else {
+      console.log('---> EVENT REMOVED!')
+      callback(null, events);
+    }
+  })
+};
+
+module.exports.Event = Event;
+module.exports.selectAll = selectAll;
+module.exports.createUser = createUser;
+module.exports.createEvent = createEvent;
+module.exports.removeEvent = removeEvent;
+module.exports.updateEvent = updateEvent;
+module.exports.findUser = findUser;
diff --git a/package.json b/package.json
@@ -25,13 +25,15 @@
     "babel-preset-es2015": "^6.22.0",
     "babel-preset-react": "^6.23.0",
     "body-parser": "^1.17.1",
+    "chai": "^3.5.0",
     "cookie-parser": "^1.4.3",
     "express": "^4.15.0",
     "express-session": "^1.15.2",
     "file-loader": "^0.10.1",
     "image-webpack-loader": "^3.3.0",
     "jquery": "^3.1.1",
     "material-ui": "^0.17.1",
+    "mocha": "^3.2.0",
     "mongodb": "^2.2.24",
     "mongoose": "^4.9.0",
     "passport": "^0.3.2",

diff --git a/server/index.js b/server/index.js
@@ -2,7 +2,7 @@ var express = require('express');
 var bodyParser = require('body-parser');
 var cookieParser = require('cookie-parser');
 var session = require('express-session');
-var db = require('../database-mongo/index.js');
+var db = require('../database-mongo/models.js');
 var bodyParser = require('body-parser');
 var request = require('request');
 var passport = require('./middleware/initGoogle.js');

diff --git a/server/middleware/initGoogle.js b/server/middleware/initGoogle.js
@@ -2,12 +2,12 @@ let GoogleStrategy = require('passport-google-oauth20').Strategy;
 
 let GoogleTokenStrategy = require('passport-google-token').Strategy;
 let passport = require('passport');
-let db = require('../../database-mongo/index.js');
+let db = require('../../database-mongo/models.js');
 
 passport.use(new GoogleStrategy({
   clientID: '898316907945-kk9tkv33a46v17qej06tfce8hmv88g44.apps.googleusercontent.com',
   clientSecret: 'SE4ddGm2SWQt8jezDRARRl7U',
-  callbackURL: 'https://ss-day-tripper-staging.herokuapp.com/auth/google/callback'
+  callbackURL: 'http://localhost:3000/auth/google/callback'
 },
 function(accesstoken, refreshToken, profile, done) {
   // console.log('this is the accesstoken', accesstoken);

diff --git a/spec/serverSpec.js b/spec/serverSpec.js
@@ -0,0 +1 @@
+var db = require('../database-mongo/models.js');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		var db = require('../database-mongo/models.js');