Start adding tests, fixed couple bugs

Author: Jrschellenberg

package-lock.json

@@ -7,7 +7,7 @@
     "babel-node": "babel-node --presets=es2015",
     "nodemon": "nodemon -e pug,js,css --exec npm run babel-node -- src/bin/www",
     "start": "SET NODE_ENV=dev && npm run nodemon",
-    "test": "mocha --timeout 10000 --compilers js:babel-register --recursive ./test/"
+    "test": "mocha --timeout 20000 --compilers js:babel-register --recursive ./test/"
   },
   "author": "",
   "license": "ISC",
@@ -17,9 +17,10 @@
     "babel-watch": "^2.0.7",
     "babelify": "^8.0.0",
     "chai": "^4.1.2",
+    "chai-http": "^3.0.0",
     "concurrently": "^3.5.1",
-    "nodemon": "^1.9.1",
-    "mocha": "^5.0.4"
+    "mocha": "^5.0.4",
+    "nodemon": "^1.9.1"
   },
   "dependencies": {
     "bcrypt": "^1.0.3",

package.json

@@ -11,14 +11,13 @@ 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 user = require('./routes/user');
 const app = express();
 
 //const env = process.env.NODE_ENV || 'dev';
@@ -33,28 +32,21 @@ const db = mongoose.connection;
 db.on('error', console.error.bind(console, 'connection error:'));
 
 db.on('connected', function() {
-	
-	//seeder.seed(data);
-	
-	
-	
 	seeder.connect(dbConfig, function(){
+		console.log("seeder connected to Database "+dbConfig);
 		// Load Mongoose models
 		seeder.loadModels([
 			'./src/models/user',
 			'./src/models/course',
 			'./src/models/review'
 		]);
-
 		// Clear specified collections
 		seeder.clearModels(['User', 'Course', 'Review'], function() {
 			// Callback to populate DB once collections have been cleared
 			seeder.populateModels(data, function() {
-				seeder.disconnect();
+				console.log("Finished seeding Database!");
 			});
-
 		});
-		console.log("seeder connected to Database!");
 	});
 });
 
@@ -75,6 +67,7 @@ app.use(cookieParser());
 app.use(express.static(path.join(__dirname, 'public')));
 
 app.use('/', index);
+app.use('/api/users', user);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
@@ -94,8 +87,4 @@ app.use(function(err, req, res, next) {
 	res.render('error');
 });
 
-
-
-
-
-module.exports = app;
+module.exports = app; //This for testing...

src/app.js

@@ -1,9 +1,58 @@
-var express = require('express');
-var router = express.Router();
+const express = require('express');
+const router = express.Router();
+const Course = require('../models/course');
+const User = require('../models/user');
 
 /* GET home page. */
 router.get('/', function(req, res, next) {
   res.render('index', { title: 'Express' });
 });
 
+router.get('/course', function(req, res, next) {
+	res.send("hello!");
+});
+
+
+router.post('/course', (req, res, next) => {
+  if(!req.body.title || !req.body.description){
+	  const err = new Error("Bad Request");
+	  err.status = 400;
+	  return next(err);
+	  //return res.json({body: req.body});
+  }
+  
+  const courseData = {
+  	user: req.body.user._id,
+	  title: req.body.title,
+	  description: req.body.description,
+	  estimatedTime: req.body.estimatedTime,
+	  materialsNeeded: req.body.materialsNeeded,
+	  steps: req.body.steps,
+	  reviews: req.body.reviews
+  };
+  console.log(courseData);
+  Course.create(courseData, (err, course) => {
+    if(err){
+    	console.log("hitting error?");
+      return next(err);
+    }
+    console.log("This shit ever get hit?");
+    return res.json({message: "Course Successfully added!", course});
+  });
+});
+
+
+router.post('/user', (req, res, next) => {
+	console.log("hit the request...");
+	const userData = req.body;
+	User.create(userData, (err, user) => {
+		console.log("got into the create method?!?!");
+		if (err) {
+			return next(err);
+		}
+		return res.json({message: "User Successfully added!", user});
+	});
+	
+});
+
 module.exports = router;

src/routes/index.js

@@ -0,0 +1,11 @@
+var express = require('express');
+var router = express.Router();
+
+/* GET home page. */
+router.get('/', function(req, res, next) {
+	res.send('test');
+});
+
+
+
+module.exports = router;

src/routes/user.js

@@ -0,0 +1,116 @@
+//During the test the env variable is set to test
+process.env.NODE_ENV = 'test';
+
+const Course = require('../src/models/course');
+
+const chai = require('chai');
+const chaiHttp = require('chai-http');
+const server = require('../src/app');
+const should = chai.should();
+
+chai.use(chaiHttp);
+
+describe('Courses', () => {
+	//This was causing hanging errors....
+	// beforeEach((done) => {
+	// 	Course.remove({}, (err) => {
+	// 		done();
+	// 	});
+	// });
+	
+	/*
+	Our GET Tests
+	 */
+	
+	describe('/GET course', () => {
+		it('should GET all the courses', (done) => {
+			chai.request(server)
+				.get('/course')
+				.end((err, res) => {
+					res.should.have.status(200);
+					done();
+				});
+			
+		});
+	});
+	
+	describe('/POST course', () => {
+		it('should POST a course with proper fields', (done) => {
+			let course = {
+				title: "My first title!",
+				description: "My course description",
+				user: {
+					_id: "57029ed4795118be119cc437"
+				},
+				steps: [
+					{
+						title: "step 1",
+						description: "My first Step"
+					}
+				]
+			};
+			chai.request(server)
+				.post('/course')
+				.send(course)
+				.end((err, res) => {
+					res.should.have.status(200);
+					res.body.should.be.a('object');
+					res.body.course.should.have.property('title');
+					
+					done();
+				});
+			
+			
+		});
+		
+		
+		it('should not POST a course without no fields', (done) => {
+			let course = {};
+			postCourse(course, done);
+		});
+		
+		it('should not POST a course without title field', (done) => {
+			let course = {
+				description: "My course description",
+				user: {
+					_id: "57029ed4795118be119cc437"
+				},
+				steps: [
+					{
+						title: "step 1",
+						description: "My first Step"
+					}
+				]
+			};
+			postCourse(course, done);
+		});
+		
+		it('should not POST a course without description field', (done) => {
+			let course = {
+				title: "my title",
+				user: {
+					_id: "57029ed4795118be119cc437"
+				},
+				steps: [
+					{
+						title: "step 1",
+						description: "My first Step"
+					}
+				]
+			};
+			postCourse(course, done);
+		});
+		function postCourse(course, done){
+			chai.request(server)
+				.post('/course')
+				.send(course)
+				.end((err, res) => {
+					res.should.have.status(400);
+					
+					done();
+				});
+		}
+	});
+	
+	
+});