diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index ddd3836..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/*.sw?
-**/node_modules
-**/db
diff --git a/kenji_crosland/.gitignore b/kenji_crosland/.gitignore
new file mode 100644
index 0000000..114214c
--- /dev/null
+++ b/kenji_crosland/.gitignore
@@ -0,0 +1,5 @@
+**/*.sw?
+node_modules
+db
+build
+**/*bundle.js
diff --git a/kenji_crosland/app/index.html b/kenji_crosland/app/index.html
new file mode 100644
index 0000000..7c44701
--- /dev/null
+++ b/kenji_crosland/app/index.html
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+ Our Super Recipe App
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
Ingredients:
+
+
+
+
+
+
+
{{headerText}}
+ {{headerText}}
+ {{headerText}}
+ {{headerText}}
+
+
+
diff --git a/kenji_crosland/app/templates/recipe_form_template.html b/kenji_crosland/app/templates/recipe_form_template.html
new file mode 100644
index 0000000..8e937d6
--- /dev/null
+++ b/kenji_crosland/app/templates/recipe_form_template.html
@@ -0,0 +1,14 @@
+
diff --git a/kenji_crosland/gulpfile.js b/kenji_crosland/gulpfile.js
index 2d415d4..fb61990 100644
--- a/kenji_crosland/gulpfile.js
+++ b/kenji_crosland/gulpfile.js
@@ -1,8 +1,13 @@
var gulp = require('gulp');
var jshint = require('gulp-jshint');
var mocha = require('gulp-mocha');
+var webpack = require('webpack-stream');
+var minifyCss = require('gulp-minify-css');
+var gulpWatch = require('gulp-watch');
+var sass = require('gulp-sass');
+var maps = require('gulp-sourcemaps');
var appFiles = ['index.js','models/**/*.js', 'routes/**/*.js', 'gulpfile.js', 'lib/**/*.js'];
-var testFiles = ['./test/**/*.js'];
+var testFiles = ['./test/test.js', './test/recipes_controller_test.js'];
gulp.task('jshint:test', function(){
return gulp.src(testFiles)
@@ -31,5 +36,45 @@ gulp.task('mocha', ['jshint'], function(){
.pipe(mocha({reporter: 'spec'}));
});
+gulp.task('static:dev', function(){
+ gulp.src('app/**/*.html')
+ .pipe(gulp.dest('build/'));
+});
+
+gulp.task('sass:dev', function(){
+ gulp.src('./app/sass/**/*.scss')
+ .pipe(maps.init())
+ .pipe(sass().on('error', sass.logError))
+ .pipe(minifyCss())
+ .pipe(maps.write('./'))
+ .pipe(gulp.dest('build/'));
+});
+
+gulp.task('sass:watch', function() {
+ gulp.watch(['./app/sass/**/*.scss', './app/index.html'], ['sass:dev','static:dev']);
+});
+
+gulp.task('webpack:dev', function(){
+ gulp.src('app/js/entry.js')
+ .pipe(webpack({
+ output: {
+ filename: 'bundle.js'
+ }
+ }))
+ .pipe(gulp.dest('build/'));
+});
+
+gulp.task('webpack:test', function(){
+ gulp.src('test/client/test_entry.js')
+ .pipe(webpack({
+ output: {
+ filename: 'test_bundle.js'
+ }
+ }))
+ .pipe(gulp.dest('test/client/'));
+});
+
+gulp.task('static:watch');
+gulp.task('build:dev', ['webpack:dev', 'static:dev', 'sass:dev']);
gulp.task('jshint', ['jshint:test', 'jshint:app']);
-gulp.task('default', ['jshint', 'mocha']);
+gulp.task('default', ['build:dev', 'jshint', 'mocha']);
diff --git a/kenji_crosland/karma.conf.js b/kenji_crosland/karma.conf.js
new file mode 100644
index 0000000..394be09
--- /dev/null
+++ b/kenji_crosland/karma.conf.js
@@ -0,0 +1,69 @@
+// Karma configuration
+// Generated on Wed Dec 02 2015 18:17:05 GMT-0800 (PST)
+
+module.exports = function(config) {
+ config.set({
+
+ // base path that will be used to resolve all patterns (eg. files, exclude)
+ basePath: '',
+
+
+ // frameworks to use
+ // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+ frameworks: ['jasmine'],
+
+
+ // list of files / patterns to load in the browser
+ files: [
+ 'test/client/test_bundle.js'
+ ],
+
+
+ // list of files to exclude
+ exclude: [
+ ],
+
+
+ // preprocess matching files before serving them to the browser
+ // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+ preprocessors: {
+ },
+
+
+ // test results reporter to use
+ // possible values: 'dots', 'progress'
+ // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+ reporters: ['progress'],
+
+
+ // web server port
+ port: 9876,
+
+
+ // enable / disable colors in the output (reporters and logs)
+ colors: true,
+
+
+ // level of logging
+ // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+ logLevel: config.LOG_INFO,
+
+
+ // enable / disable watching file and executing tests whenever any file changes
+ autoWatch: false,
+
+
+ // start these browsers
+ // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+ browsers: ['PhantomJS'],
+
+
+ // Continuous Integration mode
+ // if true, Karma captures browsers, runs the tests and exits
+ singleRun: true,
+
+ // Concurrency level
+ // how many browser should be started simultanous
+ concurrency: Infinity
+ })
+}
diff --git a/kenji_crosland/lib/basic_http_authentication.js b/kenji_crosland/lib/basic_http_authentication.js
new file mode 100644
index 0000000..1fc4338
--- /dev/null
+++ b/kenji_crosland/lib/basic_http_authentication.js
@@ -0,0 +1,18 @@
+//Got help from in class code
+module.exports = function(req, res, next) {
+ try {
+ //Could be chained into one line
+ var authString = req.headers.authorization;
+ var basicString = authString.split(' ')[1];
+ var basicBuffer = new Buffer(basicString, 'base64');
+ var authArray = basicBuffer.toString().split(':');
+ req.auth = {
+ username: authArray[0],
+ password: authArray[1]
+ };
+ next();
+ } catch (e) {
+ console.log(e);
+ return res.status(401).json({msg: 'could not authentiCat'});
+ }
+};
diff --git a/kenji_crosland/lib/eat_auth.js b/kenji_crosland/lib/eat_auth.js
new file mode 100644
index 0000000..4053e21
--- /dev/null
+++ b/kenji_crosland/lib/eat_auth.js
@@ -0,0 +1,31 @@
+//Got help from in class code
+var eat = require('eat');
+var User = require(__dirname + '/../models/user');
+
+module.exports = exports = function(req, res, next) {
+ var token = req.headers.token || (req.body)? req.body.token : '';
+ if (!token){
+ return res.json({msg: 'authentiCat seyz noe!1111@! and is watching youuuu!'});
+ }
+ eat.decode(token, process.env.APP_SECRET, function(err, decoded){
+ if (err) {
+ console.log(err);
+ return res.json({msg: 'authenitCat seyz noe!1111@!'});
+ }
+
+ User.findOne({_id: decoded.id}, function(err, user){
+ if (err) {
+ console.log(err);
+ return res.status(401).json({msg: 'authentiCat seyz noe121!'});
+ }
+
+ if (!user) {
+ console.log(err);
+ return res.status(401).json({msg: 'authentiCat seyz noe121!'});
+ }
+
+ req.user = user;
+ next();
+ });
+ });
+};
diff --git a/kenji_crosland/models/recipe.js b/kenji_crosland/models/recipe.js
index 9c98069..39042b0 100644
--- a/kenji_crosland/models/recipe.js
+++ b/kenji_crosland/models/recipe.js
@@ -5,6 +5,8 @@ var reviewSchema = require(__dirname + '/review.js').reviewSchema;
var recipeSchema = mongoose.Schema({
title: String,
ingredients: Array,
+ user: String,
+ userId: String,
reviews: [reviewSchema]
});
diff --git a/kenji_crosland/models/user.js b/kenji_crosland/models/user.js
new file mode 100644
index 0000000..fe53c62
--- /dev/null
+++ b/kenji_crosland/models/user.js
@@ -0,0 +1,32 @@
+//Got validation help here: http://nraj.tumblr.com/post/38706353543/handling-uniqueness-validation-in-mongomongoose
+
+var mongoose = require('mongoose');
+var bcrypt = require('bcrypt');
+var eat = require('eat');
+var userSchema = new mongoose.Schema({
+//Adding it at the beginning so it doesn't get deleted.
+ username: {type: String, required: true, unique: true, trim: true},
+ auth: {
+ basic:{
+ username: String,
+ password: String
+ }
+ }
+});
+
+userSchema.methods.hashPassword = function(password) {
+ var hash = this.auth.basic.password = bcrypt.hashSync(password, 8);
+ return hash;
+};
+
+userSchema.methods.checkPassword = function(password) {
+ return bcrypt.compareSync(password, this.auth.basic.password);
+
+};
+
+userSchema.methods.generateToken = function(callback){
+ var id = this._id;
+ eat.encode({id: id}, process.env.APP_SECRET, callback);
+};
+
+module.exports = mongoose.model('User', userSchema);
diff --git a/kenji_crosland/package.json b/kenji_crosland/package.json
index 534ce00..f8a80c7 100644
--- a/kenji_crosland/package.json
+++ b/kenji_crosland/package.json
@@ -9,17 +9,34 @@
"author": "Kenji Crosland",
"license": "MIT",
"dependencies": {
+ "bcrypt": "latest",
"body-parser": "^1.14.1",
+ "eat": "^0.1.1",
"express": "^4.13.3",
"mongoose": "^4.2.5"
},
"devDependencies": {
+ "angular": "^1.4.8",
+ "angular-mocks": "^1.4.8",
"chai": "^3.4.1",
"chai-http": "^1.0.0",
"gulp": "^3.9.0",
- "gulp-jshint": "^1.12.0",
+ "gulp-concat-css": "^2.2.0",
+ "gulp-jshint": "^2.0.0",
+ "gulp-minify-css": "^1.2.2",
"gulp-mocha": "^2.1.3",
+ "gulp-sass": "^2.1.0",
+ "gulp-sourcemaps": "^1.6.0",
+ "gulp-watch": "^4.3.5",
+ "jasmine-core": "^2.3.4",
+ "jshint": "^2.8.0",
"jshint-stylish": "^2.0.1",
- "mocha": "^2.3.3"
+ "karma": "^0.13.15",
+ "karma-jasmine": "^0.3.6",
+ "karma-phantomjs-launcher": "^0.2.1",
+ "mocha": "^2.3.3",
+ "phantomjs": "^1.9.19",
+ "sass-list-maps": "^1.0.0-b",
+ "webpack-stream": "^2.1.1"
}
}
diff --git a/kenji_crosland/routes/auth_routes.js b/kenji_crosland/routes/auth_routes.js
new file mode 100644
index 0000000..fbc82df
--- /dev/null
+++ b/kenji_crosland/routes/auth_routes.js
@@ -0,0 +1,53 @@
+var express = require('express');
+var jsonParser = require('body-parser').json();
+var basicHttp = require(__dirname + '/../lib/basic_http_authentication');
+var User = require(__dirname + '/../models/user');
+
+var authRouter = module.exports = exports = express.Router();
+
+authRouter.post('/signup', jsonParser, function(req, res){
+ var user = new User();
+ user.username = req.body.username;
+ user.auth.basic.username = req.body.username;
+ user.hashPassword(req.body.password);
+
+ user.save(function(err,data){
+ if (err && (11000 === err.code || 11001 === err.code)){
+ return res.status(401).json({msg: 'authentiCat seayz this user already exists'});
+ }
+ if (err) throw err;
+
+ user.generateToken(function(err, token){
+ if (err) throw err;
+ res.json({token: token});
+ });
+
+ });
+});
+
+authRouter.get('/signin', basicHttp, function(req, res){
+ if (!(req.auth.username && req.auth.password)) {
+ console.log('no basic auth provided');
+ return res.status(401).json({msg: 'authentiCat seayz noe!'});
+ }
+
+ User.findOne({'auth.basic.username': req.auth.username}, function(err, user){
+ if (err) {
+ console.log('no basic auth provided');
+ return res.status(401).json({msg: 'authentiCat seayz noe!'});
+ }
+ if (!user){
+ console.log('you are not a user');
+ return res.status(401).json({msg: 'authentiCat seayz u r not a urzr!'});
+ }
+ if (!user.checkPassword(req.auth.password)) {
+ console.log('the password donut match');
+ return res.status(401).json({msg: 'authentiCat seeeez noe!'});
+ }
+ user.generateToken(function(err, token){
+ if (err) throw err;
+
+ res.json({token: token});
+ });
+ });
+});
diff --git a/kenji_crosland/routes/recipes_routes.js b/kenji_crosland/routes/recipes_routes.js
index bd75e1f..e80ee87 100644
--- a/kenji_crosland/routes/recipes_routes.js
+++ b/kenji_crosland/routes/recipes_routes.js
@@ -3,9 +3,18 @@ var express = require('express');
var bodyParser = require('body-parser');
var Recipe = require(__dirname + '/../models/recipe').Recipe;
var Review = require(__dirname + '/../models/review').Review;
+var eatAuth = require(__dirname + '/../lib/eat_auth');
+
var recipeRouter = module.exports = express.Router();
-recipeRouter.get('/recipes', function(req, res){
+recipeRouter.get('/recipes', bodyParser.json(), function(req, res){
+ Recipe.find({userId: req.user._id}, function(err, data){
+ if (err) throw err;
+ res.json(data);
+ });
+});
+
+recipeRouter.get('/allrecipes', function(req, res){
Recipe.find({}, function(err, data){
if (err) throw err;
res.json(data);
@@ -14,6 +23,8 @@ recipeRouter.get('/recipes', function(req, res){
recipeRouter.post('/recipes', bodyParser.json(), function(req, res){
var newRecipe = new Recipe(req.body);
+ //newRecipe.userId = req.user._id;
+ //newRecipe.user = req.user.username;
newRecipe.save(function(err, data){
if (err) throw err;
res.json(data);
@@ -37,7 +48,7 @@ recipeRouter.put('/recipes/:id', bodyParser.json(), function(req, res){
});
});
-recipeRouter.delete('/recipes/:id', function(req, res){
+recipeRouter.delete('/recipes/:id', bodyParser.json(), function(req, res){
Recipe.remove({_id: req.params.id}, function(err){
if (err) return err;
res.json({msg: 'Recipe deleted!'});
diff --git a/kenji_crosland/server.js b/kenji_crosland/server.js
index d5d7ff4..d306bfb 100644
--- a/kenji_crosland/server.js
+++ b/kenji_crosland/server.js
@@ -1,17 +1,23 @@
//Made with help from in class code
-var mongoose = require('mongoose')
+var mongoose = require('mongoose');
var express = require('express');
+var fs = require('fs');
var app = express();
var recipesRouter = require(__dirname + '/routes/recipes_routes');
var ingredientsRouter = require(__dirname + '/routes/ingredients_routes');
-
-
+var authRouter = require(__dirname + '/routes/auth_routes');
+process.env.APP_SECRET = process.env.APP_SECRET = "changeme" //Use secret key
mongoose.connect(process.env.MONGOLAB_URI || 'mongodb://localhost/recipe_database');
app.use(recipesRouter);
app.use(ingredientsRouter);
-app.use(express.static(__dirname + '/public'));
+app.use(authRouter);
+app.use(express.static(__dirname + '/build'));
+
+app.use(function(req, res){
+ res.status(404).send('could not find file');
+});
app.listen(process.env.PORT || 3000, function(){
console.log('server up');
diff --git a/kenji_crosland/test/client/recipes_controller_test.js b/kenji_crosland/test/client/recipes_controller_test.js
new file mode 100644
index 0000000..f39b802
--- /dev/null
+++ b/kenji_crosland/test/client/recipes_controller_test.js
@@ -0,0 +1,88 @@
+require(__dirname + '/../../app/js/entry');
+require('angular-mocks');
+
+describe('recipes controller', function() {
+ var $httpBackend;
+ var $ControllerConstructor;
+ var $scope;
+
+ beforeEach(angular.mock.module('recipeApp'));
+
+ beforeEach(angular.mock.inject(function($rootScope, $controller){
+ $scope = $rootScope.$new();
+ $ControllerConstructor = $controller;
+ }));
+
+ it('should be able to create a controller', function() {
+ var controller = $ControllerConstructor('RecipesController', {$scope: $scope});
+ expect(typeof $scope).toBe('object');
+ expect(typeof controller).toBe('object');
+ expect(Array.isArray($scope.recipes)).toBe(true);
+ });
+
+ it('should be able to cancel editing', function(){
+ var controller = $ControllerConstructor('RecipesController', {$scope: $scope});
+ $scope.recipes.push({_id:1, title: 'test recipe'});
+ var recipe = $scope.recipes[0];
+ expect(recipe.title).toBe('test recipe');
+ $scope.makeCopy(recipe);
+ expect(recipe.editing).toBe(true);
+ expect($scope.editing[recipe._id]).toEqual(recipe);
+ $scope.cancelEditing(recipe);
+ expect(recipe.editing).toBe(false);
+ expect($scope.editing[recipe._id]).toBe(undefined);
+ });
+
+ describe('REST requests', function() {
+ beforeEach(angular.mock.inject(function(_$httpBackend_, $rootScope){
+ $httpBackend = _$httpBackend_;
+ $scope = $rootScope.$new();
+ $ControllerConstructor('RecipesController', {$scope: $scope})
+ }));
+
+ afterEach(function() {
+ $httpBackend.verifyNoOutstandingExpectation();
+ $httpBackend.verifyNoOutstandingRequest();
+ });
+
+ it('should make a GET request when getAll() is called', function(){
+ $httpBackend.expectGET('/allrecipes').respond(200, [{title: 'test recipe'}]);
+ $scope.getAll();
+ $httpBackend.flush();
+ expect($scope.recipes[0].title).toBe('test recipe');
+ });
+
+ it('should be able to create a recipe', function() {
+ $httpBackend.expectPOST('/recipes').respond(200, {title: 'Hipster Sriracha Tacos'});
+ expect($scope.recipes.length).toBe(0);
+ $scope.create({title: 'Hipster Sriracha Tacos'});
+ $httpBackend.flush();
+ expect($scope.recipes[0].title).toBe('Hipster Sriracha Tacos');
+ });
+
+ it('should be able to update a recipe', function(){
+ $scope.recipes.push({title: 'hello'});
+ expect($scope.recipes[0].title).toBe('hello');
+ $scope.newRecipe = angular.copy($scope.recipes[0]);
+ $scope.newRecipe.title = 'Spicy Hipster Sriracha Tacos';
+ $scope.newRecipe._id = '123';
+ $httpBackend.expectPUT('/recipes/' + $scope.newRecipe._id, {"_id":$scope.newRecipe._id,"title":"Spicy Hipster Sriracha Tacos","editing":false}).respond(200, {});
+ $scope.update($scope.newRecipe);
+ $httpBackend.flush();
+ expect($scope.newRecipe.editing).toBe(false);
+ });
+
+ it('should be able to delete a recipe', function() {
+ var recipe = $scope.recipes.push({_id:1, title: 'test recipe'});
+ expect($scope.recipes[0].title).toBe('test recipe');
+ expect($scope.recipes.length).toBe(1);
+ $httpBackend.expectDELETE('/recipes/' + $scope.recipes._id).respond(200,{});
+ $scope.remove(recipe);
+ $httpBackend.flush();
+ expect($scope.recipes.length).toBe(0);
+ });
+
+ });
+});
+
+
diff --git a/kenji_crosland/test/client/test_entry.js b/kenji_crosland/test/client/test_entry.js
new file mode 100644
index 0000000..57bb626
--- /dev/null
+++ b/kenji_crosland/test/client/test_entry.js
@@ -0,0 +1 @@
+require('./recipes_controller_test');
diff --git a/kenji_crosland/test/test.js b/kenji_crosland/test/test.js
index 7eb7d59..6f5adba 100644
--- a/kenji_crosland/test/test.js
+++ b/kenji_crosland/test/test.js
@@ -4,6 +4,7 @@ var chai = require('chai');
var chaiHttp = require('chai-http');
chai.use(chaiHttp);
var expect = chai.expect;
+var User = require(__dirname + '/../models/user');
process.env.MONGOLAB_URI = 'mongodb://localhost/recipe_test';
@@ -11,71 +12,88 @@ require(__dirname + '/../server');
var mongoose = require('mongoose');
var Recipe = require(__dirname + '/../models/recipe').Recipe;
-describe('recipe routes', function(){
+describe('All routes on on the recipe app', function(){
+ var token = "";
+
after(function(done){
mongoose.connection.db.dropDatabase(function(){
done();
});
});
- it('should create a recipe with a POST request',function(done){
- var recipeData = {title:'Tacos', ingredients:['pork', 'cumin', 'chili powder', 'garlic', 'onions', 'tomatoes']};
- chai.request('http://localhost:3000')
- .post('/recipes')
- .send(recipeData)
- .end(function(err,res){
+ describe('authorization routes', function(done){
+ before(function(done){
+ var userData = {username: 'Iron Chef', password:'foobar123'};
+ chai.request('http://localhost:3000')
+ .post('/signup')
+ .send(userData)
+ .end(function(err, res){
+ token = res.body.token;
expect(err).to.eql(null);
- expect(res.body.title).to.eql('Tacos');
- expect(res.body.ingredients).to.include('tomatoes');
- expect(res.body).to.have.property('_id');
+ expect(token).to.not.eql("");
done();
});
});
- it('should get all the recipes with a GET request', function(done){
- chai.request('http://localhost:3000')
- .get('/recipes')
- .end(function(err, res){
- expect(err).to.eql(null);
- expect(Array.isArray(res.body)).to.eql(true);
- done();
- });
- });
-
- describe('a test recipe', function(){
- beforeEach(function(done){
- (new Recipe({title: "Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'sugar']}))
- .save(function(err, data){
- this.recipe = data;
+ it('should have created a user with a the post request above', function(done){
+ User.findOne({'auth.basic.username': 'Iron Chef'}, function(err, user){
+ expect(user).to.not.eql(null);
+ expect(user.username).to.eql('Iron Chef');
done();
- }.bind(this));
+ });
+ });
+ it('should be able to log in with an existing username', function(done){
+ chai.request('http://localhost:3000')
+ .get('/signin')
+ .auth('Iron Chef', 'foobar123')
+ .end(function(err, res){
+ expect(err).to.eql(null);
+ expect(token).to.not.eql("");
+ done();
});
+ });
- it('should be modified by a PUT request', function(done){
+ it('should NOT be able to log in with an existing username', function(done){
chai.request('http://localhost:3000')
- .put('/recipes/' + this.recipe._id)
- .send({title:"Spicy Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'siracha', 'sugar'], reviews: [{text:"It was okay", rating:3}]})
+ .get('/signin')
+ .auth('Iron Chef', 'wrongpassword')
.end(function(err, res){
- expect(err).to.eql(null);
- expect(res.body.msg).to.eql('Recipe updated!');
+ expect(res.body.msg).to.eql('authentiCat seeeez noe!');
done();
});
});
- it('should be modified by a PUT request with a review', function(done){
+ it('should NOT create a user with an existing username', function(done){
+ var userData = {username: 'Iron Chef', password:'foobar123'};
chai.request('http://localhost:3000')
- .put('/recipes/review/' + this.recipe._id)
- .send({text:"It was tasty!", rating:5})
+ .post('/signup')
+ .send(userData)
.end(function(err, res){
+ expect(res.body.msg).to.eql('authentiCat seayz this user already exists');
+ done();
+ });
+ });
+ });
+
+ describe('recipe routes with a valid token', function(){
+
+ it('should create a recipe with a POST request',function(done){
+ var recipeData = {title:'Tacos', ingredients:['pork', 'cumin', 'chili powder', 'garlic', 'onions', 'tomatoes']/*, token: token*/};
+ chai.request('http://localhost:3000')
+ .post('/recipes')
+ .send(recipeData)
+ .end(function(err,res){
expect(err).to.eql(null);
- expect(res.body.msg).to.eql('Review Added!');
+ expect(res.body.title).to.eql('Tacos');
+ expect(res.body.ingredients).to.include('tomatoes');
+ expect(res.body).to.have.property('_id');
done();
});
});
- it('should return all recipes with a specified ingredient', function(done){
+ it('should get all the recipes with a GET request', function(done){
chai.request('http://localhost:3000')
- .get('/recipes-made-with/' + this.recipe.ingredients[0])
+ .get('/allrecipes')
.end(function(err, res){
expect(err).to.eql(null);
expect(Array.isArray(res.body)).to.eql(true);
@@ -83,14 +101,160 @@ describe('recipe routes', function(){
});
});
- it('should be deleted by a DELETE request', function(done){
+ describe('a test recipe', function(){
+ beforeEach(function(done){
+ (new Recipe({title: "Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'sugar']}))
+ .save(function(err, data){
+ this.recipe = data;
+ done();
+ }.bind(this));
+ });
+
+ it('should be modified by a PUT request', function(done){
+ chai.request('http://localhost:3000')
+ .put('/recipes/' + this.recipe._id)
+ .send({title:"Spicy Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'siracha', 'sugar'], reviews: [{text:"It was okay", rating:3}], token: token})
+ .end(function(err, res){
+ expect(err).to.eql(null);
+ expect(res.body.msg).to.eql('Recipe updated!');
+ done();
+ });
+ });
+
+ it('should be modified by a PUT request with a review', function(done){
+ chai.request('http://localhost:3000')
+ .put('/recipes/review/' + this.recipe._id)
+ .send({text:"It was tasty!", rating:5, token: token})
+ .end(function(err, res){
+ expect(err).to.eql(null);
+ expect(res.body.msg).to.eql('Review Added!');
+ done();
+ });
+ });
+
+ it('should return all recipes with a specified ingredient', function(done){
+ chai.request('http://localhost:3000')
+ .get('/recipes-made-with/' + this.recipe.ingredients[0])
+ .end(function(err, res){
+ expect(err).to.eql(null);
+ expect(Array.isArray(res.body)).to.eql(true);
+ done();
+ });
+ });
+
+ it('should be deleted by a DELETE request', function(done){
+ chai.request('http://localhost:3000')
+ .delete('/recipes/' + this.recipe._id)
+ .send({token: token})
+ .end(function(err, res){
+ expect(err).to.eql(null);
+ expect(res.body.msg).to.eql('Recipe deleted!');
+ done();
+ });
+ });
+ });
+ });
+ describe('recipe routes without sending a token', function(){
+
+ // it('should NOT create a recipe with a POST request',function(done){
+ // var recipeData = {title:'Tacos', ingredients:['pork', 'cumin', 'chili powder', 'garlic', 'onions', 'tomatoes']};
+ // chai.request('http://localhost:3000')
+ // .post('/recipes')
+ // .send(recipeData)
+ // .end(function(err,res){
+ // expect(res.body.msg).to.eql('authentiCat seyz noe!1111@! and is watching youuuu!');
+ // done();
+ // });
+ // });
+
+ // it('should NOT create a recipe with a POST request and an invalid token',function(done){
+ // var recipeData = {title:'Tacos', ingredients:['pork', 'cumin', 'chili powder', 'garlic', 'onions', 'tomatoes'], token: 'Nadda real token'};
+ // chai.request('http://localhost:3000')
+ // .post('/recipes')
+ // .send(recipeData)
+ // .end(function(err,res){
+ // expect(res.body.msg).to.eql('authenitCat seyz noe!1111@!');
+ // done();
+ // });
+ // });
+
+ it('should still get all the recipes with a GET request without the token', function(done){
chai.request('http://localhost:3000')
- .delete('/recipes/' + this.recipe._id)
+ .get('/allrecipes')
.end(function(err, res){
expect(err).to.eql(null);
- expect(res.body.msg).to.eql('Recipe deleted!');
+ expect(Array.isArray(res.body)).to.eql(true);
done();
});
});
- });
+
+ describe('a test recipe', function(){
+ beforeEach(function(done){
+ (new Recipe({title: "Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'sugar']}))
+ .save(function(err, data){
+ this.recipe = data;
+ done();
+ }.bind(this));
+ });
+
+ // it('should NOT be modified by a PUT request', function(done){
+ // chai.request('http://localhost:3000')
+ // .put('/recipes/' + this.recipe._id)
+ // .send({title:"Spicy Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'siracha', 'sugar'], reviews: [{text:"It was okay", rating:3}]})
+ // .end(function(err, res){
+ // expect(res.body.msg).to.eql('authentiCat seyz noe!1111@! and is watching youuuu!');
+ // done();
+ // });
+ // });
+
+ // it('should NOT be modified by a PUT request with an invalid token', function(done){
+ // chai.request('http://localhost:3000')
+ // .put('/recipes/' + this.recipe._id)
+ // .send({title:"Spicy Teriyaki", ingredients:['rice', 'chicken', 'soy sauce', 'siracha', 'sugar'], reviews: [{text:"It was okay", rating:3}], token: "Nadda real token"})
+ // .end(function(err, res){
+ // expect(res.body.msg).to.eql('authenitCat seyz noe!1111@!');
+ // done();
+ // });
+ // });
+
+ // it('should NOT be modified by a PUT request with a review', function(done){
+ // chai.request('http://localhost:3000')
+ // .put('/recipes/review/' + this.recipe._id)
+ // .send({text:"It was tasty!", rating:5})
+ // .end(function(err, res){
+ // expect(res.body.msg).to.eql('authentiCat seyz noe!1111@! and is watching youuuu!');
+ // done();
+ // });
+ // });
+
+ it('should still return all recipes with a specified ingredient without a token', function(done){
+ chai.request('http://localhost:3000')
+ .get('/recipes-made-with/' + this.recipe.ingredients[0])
+ .end(function(err, res){
+ expect(err).to.eql(null);
+ expect(Array.isArray(res.body)).to.eql(true);
+ done();
+ });
+ });
+
+ // it('should NOT be deleted by a DELETE request with an invalid token', function(done){
+ // chai.request('http://localhost:3000')
+ // .delete('/recipes/' + this.recipe._id)
+ // .send({token: 'Nadda real token'})
+ // .end(function(err, res){
+ // expect(res.body.msg).to.eql('authenitCat seyz noe!1111@!');
+ // done();
+ // });
+ // });
+
+ // it('should NOT be deleted by a DELETE request without a token', function(done){
+ // chai.request('http://localhost:3000')
+ // .delete('/recipes/' + this.recipe._id)
+ // .end(function(err, res){
+ // expect(res.body.msg).to.eql('authentiCat seyz noe!1111@! and is watching youuuu!');
+ // done();
+ // });
+ // });
+ });
+});
});