From a9200fecbb1875c4088ab671ccb928ce820102a4 Mon Sep 17 00:00:00 2001 From: noahgribbin Date: Tue, 28 Feb 2017 16:38:12 -0800 Subject: [PATCH 1/2] debugging tests --- .gitignore | 65 ++++++++++ .../018d5ec0-fe11-11e6-ba61-f102da4292cc.json | 1 + .../146b0640-fe17-11e6-8fed-7dcafec693d2.json | 1 + .../23addf50-fe13-11e6-96ee-43549667ee63.json | 1 + .../4dcace00-fe0f-11e6-baad-4b3a8a44b23c.json | 1 + .../66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83.json | 1 + .../8740e340-fe0f-11e6-9f79-85c72bb30ce9.json | 1 + .../cd74c270-fe0d-11e6-a085-a9fe723f1fbe.json | 1 + .../d2238e60-fe16-11e6-ab37-13edf83391ef.json | 1 + .../d5b089e0-fe0f-11e6-8fc3-f967ea5b1870.json | 1 + .../db586dc0-fe16-11e6-a37c-8f323f7cfec1.json | 1 + .../dda95f70-fe12-11e6-b02b-311c1ae35311.json | 1 + .../faf8fb30-fe0d-11e6-9972-a19d68dbd41b.json | 1 + lib/cors-middleware.js | 7 ++ lib/error-middleware.js | 21 ++++ lib/storage.js | 52 ++++++++ model/food.js | 66 +++++++++++ package.json | 39 ++++++ route/food-router.js | 41 +++++++ server.js | 25 ++++ test/food-route-test.js | 111 ++++++++++++++++++ 21 files changed, 439 insertions(+) create mode 100644 .gitignore create mode 100644 data/food/018d5ec0-fe11-11e6-ba61-f102da4292cc.json create mode 100644 data/food/146b0640-fe17-11e6-8fed-7dcafec693d2.json create mode 100644 data/food/23addf50-fe13-11e6-96ee-43549667ee63.json create mode 100644 data/food/4dcace00-fe0f-11e6-baad-4b3a8a44b23c.json create mode 100644 data/food/66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83.json create mode 100644 data/food/8740e340-fe0f-11e6-9f79-85c72bb30ce9.json create mode 100644 data/food/cd74c270-fe0d-11e6-a085-a9fe723f1fbe.json create mode 100644 data/food/d2238e60-fe16-11e6-ab37-13edf83391ef.json create mode 100644 data/food/d5b089e0-fe0f-11e6-8fc3-f967ea5b1870.json create mode 100644 data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json create mode 100644 data/food/dda95f70-fe12-11e6-b02b-311c1ae35311.json create mode 100644 data/food/faf8fb30-fe0d-11e6-9972-a19d68dbd41b.json create mode 100644 lib/cors-middleware.js create mode 100644 lib/error-middleware.js create mode 100644 lib/storage.js create mode 100644 model/food.js create mode 100644 package.json create mode 100644 route/food-router.js create mode 100644 server.js create mode 100644 test/food-route-test.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5702678 --- /dev/null +++ b/.gitignore @@ -0,0 +1,65 @@ + +# Created by https://www.gitignore.io/api/node + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +# End of https://www.gitignore.io/api/node diff --git a/data/food/018d5ec0-fe11-11e6-ba61-f102da4292cc.json b/data/food/018d5ec0-fe11-11e6-ba61-f102da4292cc.json new file mode 100644 index 0000000..a4c38ba --- /dev/null +++ b/data/food/018d5ec0-fe11-11e6-ba61-f102da4292cc.json @@ -0,0 +1 @@ +{"id":"018d5ec0-fe11-11e6-ba61-f102da4292cc","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/146b0640-fe17-11e6-8fed-7dcafec693d2.json b/data/food/146b0640-fe17-11e6-8fed-7dcafec693d2.json new file mode 100644 index 0000000..a297e8f --- /dev/null +++ b/data/food/146b0640-fe17-11e6-8fed-7dcafec693d2.json @@ -0,0 +1 @@ +{"id":"146b0640-fe17-11e6-8fed-7dcafec693d2","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/23addf50-fe13-11e6-96ee-43549667ee63.json b/data/food/23addf50-fe13-11e6-96ee-43549667ee63.json new file mode 100644 index 0000000..b5623c5 --- /dev/null +++ b/data/food/23addf50-fe13-11e6-96ee-43549667ee63.json @@ -0,0 +1 @@ +{"id":"23addf50-fe13-11e6-96ee-43549667ee63","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/4dcace00-fe0f-11e6-baad-4b3a8a44b23c.json b/data/food/4dcace00-fe0f-11e6-baad-4b3a8a44b23c.json new file mode 100644 index 0000000..cc8403a --- /dev/null +++ b/data/food/4dcace00-fe0f-11e6-baad-4b3a8a44b23c.json @@ -0,0 +1 @@ +{"id":"4dcace00-fe0f-11e6-baad-4b3a8a44b23c","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83.json b/data/food/66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83.json new file mode 100644 index 0000000..3d88728 --- /dev/null +++ b/data/food/66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83.json @@ -0,0 +1 @@ +{"id":"66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/8740e340-fe0f-11e6-9f79-85c72bb30ce9.json b/data/food/8740e340-fe0f-11e6-9f79-85c72bb30ce9.json new file mode 100644 index 0000000..f9bd3eb --- /dev/null +++ b/data/food/8740e340-fe0f-11e6-9f79-85c72bb30ce9.json @@ -0,0 +1 @@ +{"id":"8740e340-fe0f-11e6-9f79-85c72bb30ce9","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/cd74c270-fe0d-11e6-a085-a9fe723f1fbe.json b/data/food/cd74c270-fe0d-11e6-a085-a9fe723f1fbe.json new file mode 100644 index 0000000..3ecf4be --- /dev/null +++ b/data/food/cd74c270-fe0d-11e6-a085-a9fe723f1fbe.json @@ -0,0 +1 @@ +{"id":"cd74c270-fe0d-11e6-a085-a9fe723f1fbe","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/d2238e60-fe16-11e6-ab37-13edf83391ef.json b/data/food/d2238e60-fe16-11e6-ab37-13edf83391ef.json new file mode 100644 index 0000000..524daf3 --- /dev/null +++ b/data/food/d2238e60-fe16-11e6-ab37-13edf83391ef.json @@ -0,0 +1 @@ +{"id":"d2238e60-fe16-11e6-ab37-13edf83391ef","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/d5b089e0-fe0f-11e6-8fc3-f967ea5b1870.json b/data/food/d5b089e0-fe0f-11e6-8fc3-f967ea5b1870.json new file mode 100644 index 0000000..ea6df48 --- /dev/null +++ b/data/food/d5b089e0-fe0f-11e6-8fc3-f967ea5b1870.json @@ -0,0 +1 @@ +{"id":"d5b089e0-fe0f-11e6-8fc3-f967ea5b1870","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json b/data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json new file mode 100644 index 0000000..90c6901 --- /dev/null +++ b/data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json @@ -0,0 +1 @@ +{"id":"db586dc0-fe16-11e6-a37c-8f323f7cfec1","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/dda95f70-fe12-11e6-b02b-311c1ae35311.json b/data/food/dda95f70-fe12-11e6-b02b-311c1ae35311.json new file mode 100644 index 0000000..7a15549 --- /dev/null +++ b/data/food/dda95f70-fe12-11e6-b02b-311c1ae35311.json @@ -0,0 +1 @@ +{"id":"dda95f70-fe12-11e6-b02b-311c1ae35311","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/faf8fb30-fe0d-11e6-9972-a19d68dbd41b.json b/data/food/faf8fb30-fe0d-11e6-9972-a19d68dbd41b.json new file mode 100644 index 0000000..0dc023f --- /dev/null +++ b/data/food/faf8fb30-fe0d-11e6-9972-a19d68dbd41b.json @@ -0,0 +1 @@ +{"id":"faf8fb30-fe0d-11e6-9972-a19d68dbd41b","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/lib/cors-middleware.js b/lib/cors-middleware.js new file mode 100644 index 0000000..6661797 --- /dev/null +++ b/lib/cors-middleware.js @@ -0,0 +1,7 @@ +'use strict'; + +module.exports = function(req, res, next) { + res.append('Access-Control-Allow-Origin', '*'); + res.append('Access-Control-Allow-Headers', '*'); + next(); +}; diff --git a/lib/error-middleware.js b/lib/error-middleware.js new file mode 100644 index 0000000..7bda015 --- /dev/null +++ b/lib/error-middleware.js @@ -0,0 +1,21 @@ +'use strict'; + +const createError = require('http-errors'); +const debug = require('debug')('node:error-middleware'); + +module.exports = function(err, req, res, next) { + console.error(err.message); + + if(err.status) { + debug('user error'); + + res.status(err.status).send(err.name); + next(); + return; + } + + debug('server error'); + err = createError(500, err.message); + res.status(err.status).send(err.name); + next(); +}; diff --git a/lib/storage.js b/lib/storage.js new file mode 100644 index 0000000..3865cc9 --- /dev/null +++ b/lib/storage.js @@ -0,0 +1,52 @@ +'use strict'; + +const Promise = require('bluebird'); +const createError = require('http-errors'); +const debug = require('debug')('note:storage'); +const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'}); + +module.exports = exports = {}; + +exports.createItem = function(schemaName, item) { + debug('createItem'); + if(!schemaName) return Promise.reject(createError(400, 'expected schema name')); + if(!item) return Promise.reject(createError(400, 'expected item')); + + let json = JSON.stringify(item); + return fs.writeFileProm(`${__dirname}/../data/${schemaName}/${item.id}.json`, json) + .then( () => item) + .catch( err => Promise.reject(createError(500, err.meessage))); +}; + +exports.fetchItem = function(schemaName, id) { + debug('fetchItem'); + if(!schemaName) return Promise.reject(createError(400, 'expected schema name')); + if(!id) return Promise.reject(createError(400, 'expected id')); + + return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`) + .then(data => { + try { + let item = JSON.parse(data.toString()); + return item; + } catch (err) { + return Promise.reject(createError(500, err.message)); + } + }) + .catch( err => Promise.reject(createError(404, err.message))); +}; +// here is the good delete function +exports.deleteItem = function(schemaName, id) { + debug('deleteItem'); + + if (!schemaName) return Promise.reject(createError(400, 'expected schema name')); + if (!id) return Promise.reject(createError(400, 'expected schema id')); + + return fs.unlinkProm(`${__dirname}/../data/${schemaName}/${id}.json`) + .catch( err => Promise.reject(createError(404, err.message))); +}; + +exports.availIDs = function(schemaName) { + return fs.readdirProm(`${__dirname}/../data/${schemaName}`) + .then( files => files.map( name => name.split('.json')[0])) + .catch( err => Promise.reject(createError(404, err.message))); +}; diff --git a/model/food.js b/model/food.js new file mode 100644 index 0000000..f4a92ff --- /dev/null +++ b/model/food.js @@ -0,0 +1,66 @@ +'use strict'; + +const uuid = require('node-uuid'); +const createError = require('http-errors'); +const debug = require('debug')('food:food'); +const storage = require('../lib/storage.js'); + +const Food = module.exports = function(name, meal) { + debug('food constructor'); + + if(!name) throw createError(400, 'expected name'); + if(!meal) throw createError(400, 'expected meal'); + + this.id = uuid.v1(); + this.name = name; + this.meal = meal; +}; + +Food.createFood = function(_food) { + debug('createFood'); + + try { + let food = new Food(_food.name, _food.meal); + return storage.createItem('food', food); + } catch(err){ + return Promise.reject(err); + } +}; + +Food.fetchFood = function(id) { + debug('fetchfood'); + return storage.fetchItem('food', id); +}; + +// will stop usign this logic tomorrow when using mongodb +Food.updateFood = function(id, _food) { + debug('updateFood'); + + return storage.fetchItem('food', id) + .catch( err => Promise.reject(createError(404, err.message))) + .then( food => { + for(var prop in food) { + if(prop === 'id') continue; + if(_food[prop]) food[prop] = _food[prop]; + } + return storage.createItem('food', food); + }); +}; + +Food.deleteFood = function(id) { + debug('deleteFood'); + return storage.deleteItem('food', id); +}; + +Food.fetchIDs = function() { + debug('fetchIDs'); + return storage.availIDs('food'); +}; + +// started by making pagkacge.json and NM +// install dependencies +// work in food.js +// create schema constructor +// Create Storage file +// Setup server +// makme data/schema folder diff --git a/package.json b/package.json new file mode 100644 index 0000000..04b74b8 --- /dev/null +++ b/package.json @@ -0,0 +1,39 @@ +{ + "name": "12-express_middleware", + "version": "1.0.0", + "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API\r ===", + "main": "server.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node server.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/noahgribbin/12-express_middleware.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/noahgribbin/12-express_middleware/issues" + }, + "homepage": "https://github.com/noahgribbin/12-express_middleware#readme", + "dependencies": { + "bluebird": "^3.4.7", + "body-parser": "^1.16.1", + "debug": "^2.6.1", + "express": "^4.14.1", + "http-errors": "^1.6.1", + "mkdirp": "^0.5.1", + "morgan": "^1.8.1", + "node-uuid": "^1.4.7" + }, + "devDependencies": { + "chai": "^3.5.0", + "mocha": "^3.2.0", + "superagent": "^3.5.0" + } +} diff --git a/route/food-router.js b/route/food-router.js new file mode 100644 index 0000000..43921f3 --- /dev/null +++ b/route/food-router.js @@ -0,0 +1,41 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const debug= require('debug')('food:food-router'); +const Food = require('../model/food.js'); +const foodRouter = new Router(); + +foodRouter.post('/api/food', jsonParser, function(req, res, next) { + debug('POST: /api/food'); + + Food.createFood(req.body) + .then( food => res.json(food)) + .catch(err => next(err)); +}); + +foodRouter.get('/api/food/:id', jsonParser, function(req, res, next) { + debug('GET: /api/food/:id'); + + Food.fetchFood(req.params.id) + .then( food => res.json(food)) + .catch( err => next(err)); +}); + +foodRouter.get('/api/food/', function(req, res, next) { + debug('GET: /api/food'); + + Food.fetchIDs() + .then( ids => res.json(ids)) + .catch(next); +}); + +foodRouter.put('/api/food', jsonParser, function(req, res, next) { + debug('PUT: /api/food'); + + Food.updateFood(req.query.id, req.body) + .then( food => res.json(food)) + .catch(next); +}); + +module.exports = foodRouter; diff --git a/server.js b/server.js new file mode 100644 index 0000000..c5d5c70 --- /dev/null +++ b/server.js @@ -0,0 +1,25 @@ +'use strict'; + +const morgan = require('morgan'); +const express = require('express'); +const createError = require('http-errors'); +const debug = require('debug')('note:server'); + +const foodRouter = require('./route/food-router.js'); +const cors = require('./lib/cors-middleware.js'); +const errors = require('./lib/error-middleware.js'); + +const PORT = process.env.PORT || 3000; +const app = express(); + +// middleware +app.use(morgan('dev')); +app.use(cors); + +app.use(foodRouter); + +app.use(errors); + +app.listen(PORT, () => { + debug(`server up: ${PORT}`); +}); diff --git a/test/food-route-test.js b/test/food-route-test.js new file mode 100644 index 0000000..4f0c019 --- /dev/null +++ b/test/food-route-test.js @@ -0,0 +1,111 @@ +'use strict'; + +const expect = require('chai').expect(); +const request = require('superagent'); +const Food = require('../model/food.js'); +const url = 'http://localhost:8000'; + +require('../server.js'); + +const exampleFood = { + name: 'example name', + meal: 'example meal' +}; + + +describe('Food Routes', function() { + describe('GET: /api/food', function() { + before( done => { + Food.createFood(exampleFood) + .then( food => { + this.tempFood = food; + done(); + }) + .catch( err => done(err)); + }); + after(done => { + Food.deleteFood(this.tempFood.id) + .then( () => done()) + .catch( err => done(err)); + }); + it('should respond with 200 status and res.body[props] should = tempFood[props]', done => { + request.get(`${url}/api/food/${this.tempFood.id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + // expect(res.body.id).to.equal(this.tempFood.id); + // expect(res.body.name).to.equal(this.tempFood.name); + // expect(res.body.meal).to.equal(this.tempFood.meal); + done(); + }); + }); + describe('with an invalid id', function() { + it('should respond with a 404 status', done => { + request.get(`${url}/api/food/123456789`) + .end((err, res) => { + expect(res.status).to.equal(404); + done(); + }); + }); + }); + }); + describe('POST: /api/food', function() { + describe('with a valid body', function() { + after( done => { + if (this.tempFood) { + Food.deleteFood(this.tempFood.id) + .then( () => done()) + .catch( err => done(err)); + } + done(); + }); + + + it('should return a food', done => { + request.post(`${url}/api/food`) + .send(exampleFood) + .end((err, res) => { + if(err) return done(err); + expect(res.status).to.equal(200); + // expect(res.body.name).to.equal(exampleFood.name); + // expect(res.body.meal).to.equal(exampleFood.meal); + this.tempFood = res.body; + done(); + }); + }); + }); + }); + describe('PUT: /api/food', function() { + describe('with a valid id and body', function() { + before( done => { + Food.createFood(exampleFood) + .then( food => { + this.tempFood = food; + done(); + }) + .catch( err => done(err)); + }); + after( done => { + if (this.tempFood) { + Food.deleteFood(this.tempFood.id) + .then( () => done()) + .catch( err => done(err)); + } + }); + it('should return a food', done => { + let updateFood = {name: 'new name', meal: 'new contnt'}; + request.put(`${url}/api/food?id=${this.tempFood.id}`) + .send(updateFood) + .end((err, res) => { + if(err) return done(err); + expect(res.status).to.equal(200); + // expect(res.body.id).to.equal(this.tempFood.id); + // for (var prop in updateFood) { + // expect(res.body[prop]).to.equal(updateFood[prop]); + // } + done(); + }); + }); + }); + }); +}); From 43ed5c83b3f9ffe4c67a8202764f1ffeeab30021 Mon Sep 17 00:00:00 2001 From: noahgribbin Date: Tue, 28 Feb 2017 17:44:58 -0800 Subject: [PATCH 2/2] debugged tests --- .../64d98a20-fe17-11e6-b8b8-4f062c199b30.json | 1 + .../68414630-fe17-11e6-8e49-6f2924e672a2.json | 1 + .../69408dc0-fe17-11e6-9bfa-850f072f6f29.json | 1 + .../6a1fca30-fe17-11e6-9904-993162493958.json | 1 + .../6b0680b0-fe17-11e6-9da7-2b59171fbc40.json | 1 + .../6bdc2030-fe17-11e6-80c6-51afe6863e9b.json | 1 + .../6caa6cb0-fe17-11e6-9515-f7620fc270fd.json | 1 + .../6d822f10-fe17-11e6-94df-1f70e4b8c46f.json | 1 + .../6e5361c0-fe17-11e6-8374-e14ec6f222bf.json | 1 + .../db586dc0-fe16-11e6-a37c-8f323f7cfec1.json | 1 - test/food-route-test.js | 21 +++++++++---------- 11 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 data/food/64d98a20-fe17-11e6-b8b8-4f062c199b30.json create mode 100644 data/food/68414630-fe17-11e6-8e49-6f2924e672a2.json create mode 100644 data/food/69408dc0-fe17-11e6-9bfa-850f072f6f29.json create mode 100644 data/food/6a1fca30-fe17-11e6-9904-993162493958.json create mode 100644 data/food/6b0680b0-fe17-11e6-9da7-2b59171fbc40.json create mode 100644 data/food/6bdc2030-fe17-11e6-80c6-51afe6863e9b.json create mode 100644 data/food/6caa6cb0-fe17-11e6-9515-f7620fc270fd.json create mode 100644 data/food/6d822f10-fe17-11e6-94df-1f70e4b8c46f.json create mode 100644 data/food/6e5361c0-fe17-11e6-8374-e14ec6f222bf.json delete mode 100644 data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json diff --git a/data/food/64d98a20-fe17-11e6-b8b8-4f062c199b30.json b/data/food/64d98a20-fe17-11e6-b8b8-4f062c199b30.json new file mode 100644 index 0000000..7b3b890 --- /dev/null +++ b/data/food/64d98a20-fe17-11e6-b8b8-4f062c199b30.json @@ -0,0 +1 @@ +{"id":"64d98a20-fe17-11e6-b8b8-4f062c199b30","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/68414630-fe17-11e6-8e49-6f2924e672a2.json b/data/food/68414630-fe17-11e6-8e49-6f2924e672a2.json new file mode 100644 index 0000000..3527baa --- /dev/null +++ b/data/food/68414630-fe17-11e6-8e49-6f2924e672a2.json @@ -0,0 +1 @@ +{"id":"68414630-fe17-11e6-8e49-6f2924e672a2","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/69408dc0-fe17-11e6-9bfa-850f072f6f29.json b/data/food/69408dc0-fe17-11e6-9bfa-850f072f6f29.json new file mode 100644 index 0000000..8bebd36 --- /dev/null +++ b/data/food/69408dc0-fe17-11e6-9bfa-850f072f6f29.json @@ -0,0 +1 @@ +{"id":"69408dc0-fe17-11e6-9bfa-850f072f6f29","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/6a1fca30-fe17-11e6-9904-993162493958.json b/data/food/6a1fca30-fe17-11e6-9904-993162493958.json new file mode 100644 index 0000000..2cc3df1 --- /dev/null +++ b/data/food/6a1fca30-fe17-11e6-9904-993162493958.json @@ -0,0 +1 @@ +{"id":"6a1fca30-fe17-11e6-9904-993162493958","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/6b0680b0-fe17-11e6-9da7-2b59171fbc40.json b/data/food/6b0680b0-fe17-11e6-9da7-2b59171fbc40.json new file mode 100644 index 0000000..6a1d0c5 --- /dev/null +++ b/data/food/6b0680b0-fe17-11e6-9da7-2b59171fbc40.json @@ -0,0 +1 @@ +{"id":"6b0680b0-fe17-11e6-9da7-2b59171fbc40","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/6bdc2030-fe17-11e6-80c6-51afe6863e9b.json b/data/food/6bdc2030-fe17-11e6-80c6-51afe6863e9b.json new file mode 100644 index 0000000..3273ee2 --- /dev/null +++ b/data/food/6bdc2030-fe17-11e6-80c6-51afe6863e9b.json @@ -0,0 +1 @@ +{"id":"6bdc2030-fe17-11e6-80c6-51afe6863e9b","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/6caa6cb0-fe17-11e6-9515-f7620fc270fd.json b/data/food/6caa6cb0-fe17-11e6-9515-f7620fc270fd.json new file mode 100644 index 0000000..e9aa2c9 --- /dev/null +++ b/data/food/6caa6cb0-fe17-11e6-9515-f7620fc270fd.json @@ -0,0 +1 @@ +{"id":"6caa6cb0-fe17-11e6-9515-f7620fc270fd","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/6d822f10-fe17-11e6-94df-1f70e4b8c46f.json b/data/food/6d822f10-fe17-11e6-94df-1f70e4b8c46f.json new file mode 100644 index 0000000..17e5ec9 --- /dev/null +++ b/data/food/6d822f10-fe17-11e6-94df-1f70e4b8c46f.json @@ -0,0 +1 @@ +{"id":"6d822f10-fe17-11e6-94df-1f70e4b8c46f","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/6e5361c0-fe17-11e6-8374-e14ec6f222bf.json b/data/food/6e5361c0-fe17-11e6-8374-e14ec6f222bf.json new file mode 100644 index 0000000..a218318 --- /dev/null +++ b/data/food/6e5361c0-fe17-11e6-8374-e14ec6f222bf.json @@ -0,0 +1 @@ +{"id":"6e5361c0-fe17-11e6-8374-e14ec6f222bf","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json b/data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json deleted file mode 100644 index 90c6901..0000000 --- a/data/food/db586dc0-fe16-11e6-a37c-8f323f7cfec1.json +++ /dev/null @@ -1 +0,0 @@ -{"id":"db586dc0-fe16-11e6-a37c-8f323f7cfec1","name":"example name","meal":"example meal"} \ No newline at end of file diff --git a/test/food-route-test.js b/test/food-route-test.js index 4f0c019..9a0c81b 100644 --- a/test/food-route-test.js +++ b/test/food-route-test.js @@ -1,6 +1,6 @@ 'use strict'; -const expect = require('chai').expect(); +const expect = require('chai').expect; const request = require('superagent'); const Food = require('../model/food.js'); const url = 'http://localhost:8000'; @@ -33,9 +33,9 @@ describe('Food Routes', function() { .end((err, res) => { if (err) return done(err); expect(res.status).to.equal(200); - // expect(res.body.id).to.equal(this.tempFood.id); - // expect(res.body.name).to.equal(this.tempFood.name); - // expect(res.body.meal).to.equal(this.tempFood.meal); + expect(res.body.id).to.equal(this.tempFood.id); + expect(res.body.name).to.equal(this.tempFood.name); + expect(res.body.meal).to.equal(this.tempFood.meal); done(); }); }); @@ -57,7 +57,6 @@ describe('Food Routes', function() { .then( () => done()) .catch( err => done(err)); } - done(); }); @@ -67,8 +66,8 @@ describe('Food Routes', function() { .end((err, res) => { if(err) return done(err); expect(res.status).to.equal(200); - // expect(res.body.name).to.equal(exampleFood.name); - // expect(res.body.meal).to.equal(exampleFood.meal); + expect(res.body.name).to.equal(exampleFood.name); + expect(res.body.meal).to.equal(exampleFood.meal); this.tempFood = res.body; done(); }); @@ -99,10 +98,10 @@ describe('Food Routes', function() { .end((err, res) => { if(err) return done(err); expect(res.status).to.equal(200); - // expect(res.body.id).to.equal(this.tempFood.id); - // for (var prop in updateFood) { - // expect(res.body[prop]).to.equal(updateFood[prop]); - // } + expect(res.body.id).to.equal(this.tempFood.id); + for (var prop in updateFood) { + expect(res.body[prop]).to.equal(updateFood[prop]); + } done(); }); });