From e9f31720d23efadf4e3da7aa443f7d54cdec0b35 Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 13:37:05 -0700 Subject: [PATCH 1/8] Scaffold --- .eslintignore | 5 ++ .eslintrc | 21 +++++++ .gitignore | 136 ++++++++++++++++++++++++++++++++++++++++ lib/cors-middleware.js | 0 lib/error-middleware.js | 0 lib/storage.js | 0 model/bake.js | 0 route/bake-router.js | 0 server.js | 0 test/bake-route-test.js | 0 10 files changed, 162 insertions(+) create mode 100644 .eslintignore create mode 100644 .eslintrc create mode 100644 .gitignore create mode 100644 lib/cors-middleware.js create mode 100644 lib/error-middleware.js create mode 100644 lib/storage.js create mode 100644 model/bake.js create mode 100644 route/bake-router.js create mode 100644 server.js create mode 100644 test/bake-route-test.js diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..82ff623 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,5 @@ +**/node_modules/* +**/vendor/* +**/*.min.js +**/coverage/* +**/build/* \ No newline at end of file diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..b663d77 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,21 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..393ef53 --- /dev/null +++ b/.gitignore @@ -0,0 +1,136 @@ +# Created by https://www.gitignore.io/api/osx,vim,node,macos,windows + +### macOS ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### 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 + + +### OSX ### + +# Icon must end with two \r + +# Thumbnails + +# Files that might appear in the root of a volume + +# Directories potentially created on remote AFP share + +### Vim ### +# swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/osx,vim,node,macos,windows \ No newline at end of file diff --git a/lib/cors-middleware.js b/lib/cors-middleware.js new file mode 100644 index 0000000..e69de29 diff --git a/lib/error-middleware.js b/lib/error-middleware.js new file mode 100644 index 0000000..e69de29 diff --git a/lib/storage.js b/lib/storage.js new file mode 100644 index 0000000..e69de29 diff --git a/model/bake.js b/model/bake.js new file mode 100644 index 0000000..e69de29 diff --git a/route/bake-router.js b/route/bake-router.js new file mode 100644 index 0000000..e69de29 diff --git a/server.js b/server.js new file mode 100644 index 0000000..e69de29 diff --git a/test/bake-route-test.js b/test/bake-route-test.js new file mode 100644 index 0000000..e69de29 From db5890f2ff1e3ad9d3cf6ecb459e5b08fc852b9a Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 13:50:00 -0700 Subject: [PATCH 2/8] Adds CORS and error middleware --- lib/cors-middleware.js | 7 +++++++ lib/error-middleware.js | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/lib/cors-middleware.js b/lib/cors-middleware.js index e69de29..3ad0d61 100644 --- a/lib/cors-middleware.js +++ 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(); +}; \ No newline at end of file diff --git a/lib/error-middleware.js b/lib/error-middleware.js index e69de29..26e4240 100644 --- a/lib/error-middleware.js +++ b/lib/error-middleware.js @@ -0,0 +1,20 @@ +const createError = require('http-errors'); +const debug = require('debug')('bake: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(); +}; \ No newline at end of file From c9c517f6a8d5084254aaba52f44b31e96f4d8897 Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 13:54:43 -0700 Subject: [PATCH 3/8] Adds Use Strict --- lib/error-middleware.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/error-middleware.js b/lib/error-middleware.js index 26e4240..752bc14 100644 --- a/lib/error-middleware.js +++ b/lib/error-middleware.js @@ -1,3 +1,5 @@ +'use strict'; + const createError = require('http-errors'); const debug = require('debug')('bake:error-middleware'); From 628cfbb2f3111a6629ca9bc00d4e4ff565213301 Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 13:56:40 -0700 Subject: [PATCH 4/8] Adds package.json and dependencies --- package.json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..25b2810 --- /dev/null +++ b/package.json @@ -0,0 +1,38 @@ +{ + "name": "12-express-middleware", + "version": "1.0.0", + "description": "![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware ======", + "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/ohjonah/12-express-middleware.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/ohjonah/12-express-middleware/issues" + }, + "homepage": "https://github.com/ohjonah/12-express-middleware#readme", + "dependencies": { + "bluebird": "^3.5.0", + "body-parser": "^1.17.2", + "debug": "^2.6.8", + "express": "^4.15.3", + "http-errors": "^1.6.1", + "morgan": "^1.8.2", + "uuid": "^3.1.0" + }, + "devDependencies": { + "chai": "^4.1.0", + "mocha": "^3.5.0", + "superagent": "^3.5.2" + } +} From f3632ea9fc6e1b6c4ed68e8ba391511b46ae59dc Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 14:04:47 -0700 Subject: [PATCH 5/8] Adds Internal Modules --- lib/storage.js | 49 +++++++++++++++++++++ model/bake.js | 41 +++++++++++++++++ test/bake-route-test.js | 97 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) diff --git a/lib/storage.js b/lib/storage.js index e69de29..ab17ccd 100644 --- a/lib/storage.js +++ b/lib/storage.js @@ -0,0 +1,49 @@ +'use strict'; + +const Promise = require('bluebird'); +const fs = Promise.promisifyAll(require('fs'), { suffix: 'Prom' }); +const createError = require('http-errors'); +const debug = require('debug')('bake:storage'); + +module.exports = exports = {}; + +exports.createItem = function(schemaName, item) { + debug('create item'); + + 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( () => Promise.reject(createError(400, 'unable to write file'))); +}; + +exports.fetchItem = function(schemaName, id) { + debug('fetch item'); + + 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(404, 'expected SOMETHING')); + } + }) + .catch( () => Promise.reject(createError(404, 'no file found'))); +}; + +exports.deleteItem = function(schemaName, id) { + debug('delete item'); + + if (!schemaName) return Promise.reject(createError(400, 'expected schema name')); + if (!id) return Promise.reject(createError(400, 'expected id')); + + return fs.unlinkProm(`${__dirname}/../data/${schemaName}/${id}.json`) + .then( () => console.log(`${id} deleted`)) + .catch( err => Promise.reject(err)); +}; diff --git a/model/bake.js b/model/bake.js index e69de29..293f93e 100644 --- a/model/bake.js +++ b/model/bake.js @@ -0,0 +1,41 @@ +'use strict'; + +const uuidv4 = require('uuid/v4'); +const createError = require('http-errors'); +const debug = require('debug')('bake:bake'); +const storage = require('../lib/storage.js'); + +const Bake = module.exports = function(bakedGood, description, calories) { + if (!bakedGood) throw createError(400, 'expected baked good'); + if (!description) throw createError(400, 'expected description'); + if (!calories) throw createError(400, 'expected expected calories'); + + this.id = uuidv4(); + this.bakedGood = bakedGood; + this.description = description; + this.calories = calories; +}; + +Bake.createBakedGood = function(_bake) { + debug('createBakedGood'); + + try { + let bake = new Bake(_bake.bakedGood, _bake.description, _bake.calories); + return storage.createItem('bake', bake); + } catch (err) { + return Promise.reject(err); + } +}; + +Bake.fetchBakedGood = function(id) { + debug('fetchBakedGood'); + + return storage.fetchItem('bake', id); +}; + +Bake.deleteBakedGood = function(id) { + debug('deleteBakedGood'); + + return storage.deleteItem('bake', id); +}; + diff --git a/test/bake-route-test.js b/test/bake-route-test.js index e69de29..4020775 100644 --- a/test/bake-route-test.js +++ b/test/bake-route-test.js @@ -0,0 +1,97 @@ +'use strict'; + +const request = require('superagent'); +const expect = require('chai').expect; + +require('../server.js'); + +describe('Baked Good Routes', function() { + var bake = null; + + describe('GET: /test', function() { + it('should return msg', done => { + request.get('localhost:8000/test') + .end((err, res) => { + expect(res.status).to.equal(200); + done(); + }); + }); + }); + + describe('POST: 400/Bad Request', function() { + it('should return 400', done => { + request.post('localhost:8000/api/bake') + .end((err, res) => { + expect(res.status).to.equal(400); + done(); + }); + }); + }); + + describe('POST: /api/bake', function() { + it('should make a baked good', function(done) { + request.post('localhost:8000/api/bake') + .send({ + bakedGood: 'muffin', + description: 'naked cupcake', + calories: 255 + }) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.bakedGood).to.equal('muffin'); + expect(res.body.description).to.equal('naked cupcake'); + expect(res.body.calories).to.equal(255); + + bake = res.body; + done(); + }); + }); + }); + + describe('GET: /api/bake', function() { + it('should return a baked good', function(done) { + request.get(`localhost:8000/api/bake?id=${bake.id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.bakedGood).to.equal('muffin'); + expect(res.body.description).to.equal('naked cupcake'); + expect(res.body.calories).to.equal(255); + done(); + }); + }); + }); + + describe('GET: 404/Unregistered Route', () => { + it('should return a 404', done => { + request.get('localhost:8000/api/baykk') + .end((err, res) => { + expect(res.status).to.equal(404); + done(); + }); + }); + }); + + describe('GET: 400/No ID', () => { + it('should return a 400', done => { + request.get('localhost:8000/api/bake') + .end((err, res) => { + expect(res.status).to.equal(400); + done(); + }); + }); + }); + + describe('DELETE: /api/bake', function() { + it('should delete a baked good', done => { + request.delete(`localhost:8000/api/bake?id=${bake.id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(204); + expect(res.body.bakedGood).to.equal(undefined); + done(); + }); + }); + }); +}); \ No newline at end of file From 8bdd49c0f586046273f48a31861a9b8f256d2201 Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 15:30:00 -0700 Subject: [PATCH 6/8] Adds and Modularizes --- lib/storage.js | 8 ++++++- model/bake.js | 18 ++++++++++++++ route/bake-router.js | 53 +++++++++++++++++++++++++++++++++++++++++ server.js | 20 ++++++++++++++++ test/bake-route-test.js | 10 -------- 5 files changed, 98 insertions(+), 11 deletions(-) diff --git a/lib/storage.js b/lib/storage.js index ab17ccd..2210866 100644 --- a/lib/storage.js +++ b/lib/storage.js @@ -45,5 +45,11 @@ exports.deleteItem = function(schemaName, id) { return fs.unlinkProm(`${__dirname}/../data/${schemaName}/${id}.json`) .then( () => console.log(`${id} deleted`)) - .catch( err => Promise.reject(err)); + .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/bake.js b/model/bake.js index 293f93e..35913a4 100644 --- a/model/bake.js +++ b/model/bake.js @@ -33,9 +33,27 @@ Bake.fetchBakedGood = function(id) { return storage.fetchItem('bake', id); }; +Bake.updateBake = function(id, _bake) { + debug('updateBake'); + + return storage.fetchItem('bake', id) + .catch( err => Promise.reject(createError(404, err.message))) + .then( bake=> { + for (var prop in bake) { + if (prop === 'id') continue; + if(_bake[prop]) bake[prop] = _bake[prop]; + } + return storage.createItem('bake', bake); + }); +}; + Bake.deleteBakedGood = function(id) { debug('deleteBakedGood'); return storage.deleteItem('bake', id); }; +Bake.fetchIDs = function() { + debug('fetchIds'); + return storage.availIDs('note'); +}; diff --git a/route/bake-router.js b/route/bake-router.js index e69de29..e7a2908 100644 --- a/route/bake-router.js +++ b/route/bake-router.js @@ -0,0 +1,53 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const debug = require('debug')('bake:bake-router'); +const Bake = require('../model/bake.js'); +const bakeRouter = new Router(); + +module.exports = bakeRouter; + +bakeRouter.post('/api/bake', jsonParser, function(req, res, next) { + debug('POST: /api/bake'); + + Bake.createBakedGood(req.body) + .then( bake => res.json(bake)) + .catch( err => next(err)); +}); + +bakeRouter.get('/api/bake/:id', function(req, res, next) { + debug('GET: /api/bake/:id'); + + Bake.fetchBakedGood(req.params.id) + .then( bake => res.json(bake)) + .catch( err => next(err)); +}); + +bakeRouter.get('/api/note', function(Req, res, next) { + debug('GET: /api/note'); + + Note.fetchIDs() + .then( ids => res.json(ids)) + .catch( err => next(err)); +}); + +bakeRouter.put('/api/note/:id', jsonParser, function(req, res, next) { + debug('PUT: /api/note/:id'); + + Bake.updateBake(req.params.id, req.body) + .then( note => res.json(note)) + .catch( err => next(err)); +}); + + + +bakeRouter.delete('/api/bake', function(req, res, next) { + debug('DELETE: /api/bake'); + + Bake.deleteBakedGood(req.query.id) + .then( () => { + res.status(204).end(); + }) + .catch( err => next(err)); +}); \ No newline at end of file diff --git a/server.js b/server.js index e69de29..0153b58 100644 --- a/server.js +++ b/server.js @@ -0,0 +1,20 @@ +'use strict'; + +const morgan = require('morgan'); +const express = require('express'); +const debug = require('debug')('bake:server'); + +const bakeRouter = require('./route/bake-router.js'); +const cors = require('./lib/cors-middleware.js'); +const jsonParser = require('body-parser').json(); + +const Bake = require('./model/bake.js'); + +const PORT = process.env.PORT || 3000; +const app = express(); + +app.use(morgan('dev')); + +app.listen(PORT, () => { + debug(`Server listening on PORT: ${PORT}`); +}); \ No newline at end of file diff --git a/test/bake-route-test.js b/test/bake-route-test.js index 4020775..8bf3261 100644 --- a/test/bake-route-test.js +++ b/test/bake-route-test.js @@ -8,16 +8,6 @@ require('../server.js'); describe('Baked Good Routes', function() { var bake = null; - describe('GET: /test', function() { - it('should return msg', done => { - request.get('localhost:8000/test') - .end((err, res) => { - expect(res.status).to.equal(200); - done(); - }); - }); - }); - describe('POST: 400/Bad Request', function() { it('should return 400', done => { request.post('localhost:8000/api/bake') From e5e82f9988aca2d2c43cbb252fe9b6f0987261d1 Mon Sep 17 00:00:00 2001 From: ohjonah Date: Tue, 1 Aug 2017 16:38:35 -0700 Subject: [PATCH 7/8] Adds Tests --- model/bake.js | 4 +-- package.json | 4 +-- route/bake-router.js | 20 ++++++++----- server.js | 7 +++-- test/bake-route-test.js | 66 +++++++++++++++++++++++++++++++---------- 5 files changed, 71 insertions(+), 30 deletions(-) diff --git a/model/bake.js b/model/bake.js index 35913a4..0f77716 100644 --- a/model/bake.js +++ b/model/bake.js @@ -38,7 +38,7 @@ Bake.updateBake = function(id, _bake) { return storage.fetchItem('bake', id) .catch( err => Promise.reject(createError(404, err.message))) - .then( bake=> { + .then( bake => { for (var prop in bake) { if (prop === 'id') continue; if(_bake[prop]) bake[prop] = _bake[prop]; @@ -55,5 +55,5 @@ Bake.deleteBakedGood = function(id) { Bake.fetchIDs = function() { debug('fetchIds'); - return storage.availIDs('note'); + return storage.availIDs('bake'); }; diff --git a/package.json b/package.json index 25b2810..da3e7d6 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "test": "test" }, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "start": "node server.js" + "test": "DEBUG='bake*' mocha", + "start": "DEBUG='bake*' node server.js" }, "repository": { "type": "git", diff --git a/route/bake-router.js b/route/bake-router.js index e7a2908..b807896 100644 --- a/route/bake-router.js +++ b/route/bake-router.js @@ -8,6 +8,12 @@ const bakeRouter = new Router(); module.exports = bakeRouter; +bakeRouter.get('/test', function(req, res) { + debug('TEST'); + + res.json({ msg: 'hello'}); +}); + bakeRouter.post('/api/bake', jsonParser, function(req, res, next) { debug('POST: /api/bake'); @@ -24,24 +30,22 @@ bakeRouter.get('/api/bake/:id', function(req, res, next) { .catch( err => next(err)); }); -bakeRouter.get('/api/note', function(Req, res, next) { - debug('GET: /api/note'); +bakeRouter.get('/api/bake', function(Req, res, next) { + debug('GET: /api/bake'); - Note.fetchIDs() + Bake.fetchIDs() .then( ids => res.json(ids)) .catch( err => next(err)); }); -bakeRouter.put('/api/note/:id', jsonParser, function(req, res, next) { - debug('PUT: /api/note/:id'); +bakeRouter.put('/api/bake/:id', jsonParser, function(req, res, next) { + debug('PUT: /api/bake/:id'); Bake.updateBake(req.params.id, req.body) - .then( note => res.json(note)) + .then( bake => res.json(bake)) .catch( err => next(err)); }); - - bakeRouter.delete('/api/bake', function(req, res, next) { debug('DELETE: /api/bake'); diff --git a/server.js b/server.js index 0153b58..0da73aa 100644 --- a/server.js +++ b/server.js @@ -6,14 +6,15 @@ const debug = require('debug')('bake:server'); const bakeRouter = require('./route/bake-router.js'); const cors = require('./lib/cors-middleware.js'); -const jsonParser = require('body-parser').json(); - -const Bake = require('./model/bake.js'); +const errors = require('./lib/error-middleware'); const PORT = process.env.PORT || 3000; const app = express(); app.use(morgan('dev')); +app.use(cors); +app.use(bakeRouter); +app.use(errors); app.listen(PORT, () => { debug(`Server listening on PORT: ${PORT}`); diff --git a/test/bake-route-test.js b/test/bake-route-test.js index 8bf3261..ce79b2e 100644 --- a/test/bake-route-test.js +++ b/test/bake-route-test.js @@ -2,15 +2,23 @@ const request = require('superagent'); const expect = require('chai').expect; +const Bake = require('../model/bake.js'); +const url = 'http://localhost:8000'; require('../server.js'); +const exampleBakedGood = { + bakedGood: 'connoli', + description: 'dessert', + calories: '350' +}; + describe('Baked Good Routes', function() { var bake = null; describe('POST: 400/Bad Request', function() { it('should return 400', done => { - request.post('localhost:8000/api/bake') + request.post(`${url}/api/bake`) .end((err, res) => { expect(res.status).to.equal(400); done(); @@ -20,7 +28,7 @@ describe('Baked Good Routes', function() { describe('POST: /api/bake', function() { it('should make a baked good', function(done) { - request.post('localhost:8000/api/bake') + request.post(`${url}/api/bake`) .send({ bakedGood: 'muffin', description: 'naked cupcake', @@ -39,9 +47,37 @@ describe('Baked Good Routes', function() { }); }); + describe('GET: /api/bake', function() { + describe('with a valid id', function() { + before( done => { + Bake.createBakedGood(exampleBakedGood) + .then( bake => { + this.tempBake = bake; + done(); + }) + .catch( err => done(err)); + }); + + after( done => { + Bake.deleteBakedGood(this.tempBake.id) + .then( () => done()) + .catch( err => done(err)); + }); + + it('should return a bake', done => { + request.get(`${url}/api/bake/${this.tempBake.id}`) + .end( (err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + done(); + }); + }); + }); + }); + describe('GET: /api/bake', function() { it('should return a baked good', function(done) { - request.get(`localhost:8000/api/bake?id=${bake.id}`) + request.get(`${url}/api/bake/i${bake.id}`) .end((err, res) => { if (err) return done(err); expect(res.status).to.equal(200); @@ -55,7 +91,7 @@ describe('Baked Good Routes', function() { describe('GET: 404/Unregistered Route', () => { it('should return a 404', done => { - request.get('localhost:8000/api/baykk') + request.get(`${url}/api/baykk`) .end((err, res) => { expect(res.status).to.equal(404); done(); @@ -63,19 +99,19 @@ describe('Baked Good Routes', function() { }); }); - describe('GET: 400/No ID', () => { - it('should return a 400', done => { - request.get('localhost:8000/api/bake') - .end((err, res) => { - expect(res.status).to.equal(400); - done(); - }); - }); - }); - + // describe('GET: 400/No ID', () => { + // it('should return a 400', done => { + // request.get(`${url}/api/bake`) + // .end((err, res) => { + // expect(res.status).to.equal(400); + // done(); + // }); + // }); + // }); + // describe('DELETE: /api/bake', function() { it('should delete a baked good', done => { - request.delete(`localhost:8000/api/bake?id=${bake.id}`) + request.delete(`${url}/api/bake?id=${bake.id}`) .end((err, res) => { if (err) return done(err); expect(res.status).to.equal(204); From a1e3001ced2a8a3382c657675b8849e68f64cbeb Mon Sep 17 00:00:00 2001 From: ohjonah Date: Wed, 2 Aug 2017 14:17:06 -0700 Subject: [PATCH 8/8] Refactors and Fixes Typo --- README.md | 17 -------- test/bake-route-test.js | 96 ++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 66 deletions(-) diff --git a/README.md b/README.md index 8d00d0f..859eee2 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,3 @@ -![cf](https://i.imgur.com/7v5ASc8.png) 12: Express Middleware -====== - -## Submission Instructions - * fork this repository & create a new branch for your work - * write all of your code in a directory named `lab-` + `` **e.g.** `lab-susan` - * push to your repository - * submit a pull request to this repository - * submit a link to your PR in canvas - * write a question and observation on canvas - -## Learning Objectives -* students will be able to work with application, router, and 3rd party middleware through the use of express.js -* students will be able to implement custom middleware through the use of express.js -* students will be able to create custom routers for a specific resource - -## Requirements #### Configuration * `package.json` diff --git a/test/bake-route-test.js b/test/bake-route-test.js index ce79b2e..608aed0 100644 --- a/test/bake-route-test.js +++ b/test/bake-route-test.js @@ -13,9 +13,7 @@ const exampleBakedGood = { calories: '350' }; -describe('Baked Good Routes', function() { - var bake = null; - +describe('Baked Goods Routes', function() { describe('POST: 400/Bad Request', function() { it('should return 400', done => { request.post(`${url}/api/bake`) @@ -27,7 +25,15 @@ describe('Baked Good Routes', function() { }); describe('POST: /api/bake', function() { - it('should make a baked good', function(done) { + let tempID; + + after( done => { + Bake.deleteBakedGood(tempID) + .then( () => done()) + .catch( err => done(err)); + }); + + it('should make a baked good', done => { request.post(`${url}/api/bake`) .send({ bakedGood: 'muffin', @@ -36,54 +42,37 @@ describe('Baked Good Routes', function() { }) .end((err, res) => { if (err) return done(err); + tempID = res.body.id; expect(res.status).to.equal(200); expect(res.body.bakedGood).to.equal('muffin'); expect(res.body.description).to.equal('naked cupcake'); expect(res.body.calories).to.equal(255); - - bake = res.body; done(); }); }); }); - describe('GET: /api/bake', function() { - describe('with a valid id', function() { - before( done => { - Bake.createBakedGood(exampleBakedGood) - .then( bake => { - this.tempBake = bake; - done(); - }) - .catch( err => done(err)); - }); - - after( done => { - Bake.deleteBakedGood(this.tempBake.id) - .then( () => done()) - .catch( err => done(err)); - }); + describe('GET: /api/bake with a valid id', function() { + before( done => { + Bake.createBakedGood(exampleBakedGood) + .then( bake => { + this.tempBake = bake; + done(); + }) + .catch( err => done(err)); + }); - it('should return a bake', done => { - request.get(`${url}/api/bake/${this.tempBake.id}`) - .end( (err, res) => { - if (err) return done(err); - expect(res.status).to.equal(200); - done(); - }); - }); + after( done => { + Bake.deleteBakedGood(this.tempBake.id) + .then( () => done()) + .catch( err => done(err)); }); - }); - describe('GET: /api/bake', function() { - it('should return a baked good', function(done) { - request.get(`${url}/api/bake/i${bake.id}`) - .end((err, res) => { + it('should return a baked good', done => { + request.get(`${url}/api/bake/${this.tempBake.id}`) + .end( (err, res) => { if (err) return done(err); expect(res.status).to.equal(200); - expect(res.body.bakedGood).to.equal('muffin'); - expect(res.body.description).to.equal('naked cupcake'); - expect(res.body.calories).to.equal(255); done(); }); }); @@ -99,19 +88,28 @@ describe('Baked Good Routes', function() { }); }); - // describe('GET: 400/No ID', () => { - // it('should return a 400', done => { - // request.get(`${url}/api/bake`) - // .end((err, res) => { - // expect(res.status).to.equal(400); - // done(); - // }); - // }); - // }); - // + describe('GET: 404/Invalid Id', () => { + it('should return a 404', done => { + request.get(`${url}/api/bake/12345`) + .end((err, res) => { + expect(res.status).to.equal(404); + done(); + }); + }); + }); + describe('DELETE: /api/bake', function() { + before( done => { + Bake.createBakedGood(exampleBakedGood) + .then( bake => { + this.tempBake = bake; + done(); + }) + .catch( err => done(err)); + }); + it('should delete a baked good', done => { - request.delete(`${url}/api/bake?id=${bake.id}`) + request.delete(`${url}/api/bake?id=${this.tempBake.id}`) .end((err, res) => { if (err) return done(err); expect(res.status).to.equal(204);