From b57b96cb9aec8a765ac8f205401fa13cc9ab6059 Mon Sep 17 00:00:00 2001 From: Shiv Unadkat Date: Tue, 28 Feb 2017 14:50:20 -0800 Subject: [PATCH 1/6] basic first commit with all dependencies skeleton files --- lab-shiv/.eslintrc | 21 +++++++ lab-shiv/.gitignore | 117 +++++++++++++++++++++++++++++++++++ lab-shiv/README.md | 28 +++++++++ lab-shiv/gulpfile.js | 19 ++++++ lab-shiv/package.json | 35 +++++++++++ lab-shiv/route/note-route.js | 1 + 6 files changed, 221 insertions(+) create mode 100644 lab-shiv/.eslintrc create mode 100644 lab-shiv/.gitignore create mode 100644 lab-shiv/README.md create mode 100644 lab-shiv/gulpfile.js create mode 100644 lab-shiv/package.json create mode 100644 lab-shiv/route/note-route.js diff --git a/lab-shiv/.eslintrc b/lab-shiv/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/lab-shiv/.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" +} diff --git a/lab-shiv/.gitignore b/lab-shiv/.gitignore new file mode 100644 index 0000000..0992345 --- /dev/null +++ b/lab-shiv/.gitignore @@ -0,0 +1,117 @@ +# Created by https://www.gitignore.io/api/node,vim,osx,macos,linux + +*node_modules + +### Node ### +# Logs +logs +*.log +npm-debug.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 + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# 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 + + + +### 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 + + +### OSX ### +*.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 + + +### macOS ### +# Icon must end with two \r +# Thumbnails +# Files that might appear in the root of a volume +# Directories potentially created on remote AFP share + + +### Linux ### + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# End of https://www.gitignore.io/api/node,vim,osx,macos,linux diff --git a/lab-shiv/README.md b/lab-shiv/README.md new file mode 100644 index 0000000..efca449 --- /dev/null +++ b/lab-shiv/README.md @@ -0,0 +1,28 @@ +![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API +=== + +## To Submit this Assignment + * Fork this repository + * Write all of your code in a directory named `lab-` + `` **e.g.** `lab-brian` + * 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 + +## Include + * `package.json` + * `.eslintrc` + * `gulpfile.js` + * `.gitignore` + * `README.md` + +## Description + * Create a single resource `express` API that can handle **GET**, **POST**, and **PUT** requests + * Use the `http-errors` module to create new errors and associate them with a proper status code + * Create an `error-middleware` module to handle errors and *use* it in your server file + * Create a `cors-middleware` module that will allow for public use of your API + * Create the `deleteItem` and `availIDs` methods and add them to your `storage` module + * these methods should be used to delete a resource (`deleteItem`) and return an array of id's from persisted resource filenames (`availIDs`) + * Create the `updateNote`, `fetchNote`, and `fetchIDs` static methods as part of your `Note` model + * Create a series of `note-route-tests` to test your **GET**, **POST**, and **PUT** routes + * **hint:** *you'll want to use the `before` and `after` hooks provided by `mocha` in order to create a test note and delete the note after the test has completed* diff --git a/lab-shiv/gulpfile.js b/lab-shiv/gulpfile.js new file mode 100644 index 0000000..5d4623d --- /dev/null +++ b/lab-shiv/gulpfile.js @@ -0,0 +1,19 @@ +'use strict'; + +const gulp = require('gulp'); +const eslint = require('gulp-eslint'); +const mocha = require('gulp-mocha'); + +gulp.task('test', function(){ + gulp.src('./test/*-test.js', {read:false}) + .pipe(mocha({reporter:'spec'})); +}); + +gulp.task('lint', function(){ + return gulp.src(['**/*.js', '!node_modules']) + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); +}); + +gulp.task('default', ['test', 'lint']); diff --git a/lab-shiv/package.json b/lab-shiv/package.json new file mode 100644 index 0000000..a49033e --- /dev/null +++ b/lab-shiv/package.json @@ -0,0 +1,35 @@ +{ + "name": "12-express_middleware", + "version": "1.0.0", + "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API\r ===", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/shivprogrammer/12-express_middleware.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/shivprogrammer/12-express_middleware/issues" + }, + "homepage": "https://github.com/shivprogrammer/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/lab-shiv/route/note-route.js b/lab-shiv/route/note-route.js new file mode 100644 index 0000000..ad9a93a --- /dev/null +++ b/lab-shiv/route/note-route.js @@ -0,0 +1 @@ +'use strict'; From 3cc8aa6efee7b9f64682e8e255e38790699ee44d Mon Sep 17 00:00:00 2001 From: Shiv Unadkat Date: Tue, 28 Feb 2017 16:15:25 -0800 Subject: [PATCH 2/6] note-route dissection completed --- lab-shiv/route/note-route.js | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lab-shiv/route/note-route.js b/lab-shiv/route/note-route.js index ad9a93a..b326352 100644 --- a/lab-shiv/route/note-route.js +++ b/lab-shiv/route/note-route.js @@ -1 +1,41 @@ 'use strict'; + +const Router = require('express').Router; +const jsonParser = require('bodyParser').json(); +const debug = require('debug')('note:note-router'); +const Note = require('../model/note.js'); +const noteRouter = new Router(); + +noteRouter.post('/api/note', jsonParser, function(res, req, next) { + debug ('POST: /api/note'); + + Note.createNote(req.body) + .then( note => res.json(note)) + .catch(next); +}); + +noteRouter.get('/api/note/:id', function(res, req, next) { + debug('GET: /api/note/:id'); + + Note.fetchNote(req.params.id) + .then( note => res.json(note)) + .catch(next); +}); + +noteRouter.get('/api/note', function(res, req, next) { + debug('GET: /api/note'); + + Note.fetchIDs() + .then( ids => res.json(ids)) + .catch(next); +}); + +noteRouter.put('/api/note', jsonParser, function(res, req, next) { + debug('PUT: /api/note'); + + Note.updateNote(req.query.id, req.body) + .then( note => res.json(note)) + .catch(next); +}); + +module.exports = noteRouter; From 1f5dbb5734ad20bf361c8287d927a6a7ae462ca2 Mon Sep 17 00:00:00 2001 From: Shiv Unadkat Date: Tue, 28 Feb 2017 17:10:18 -0800 Subject: [PATCH 3/6] full dissection of cors middleware complete --- lab-shiv/lib/cors-middleware.js | 7 +++++++ lab-shiv/lib/error-middleware.js | 0 2 files changed, 7 insertions(+) create mode 100644 lab-shiv/lib/cors-middleware.js create mode 100644 lab-shiv/lib/error-middleware.js diff --git a/lab-shiv/lib/cors-middleware.js b/lab-shiv/lib/cors-middleware.js new file mode 100644 index 0000000..6661797 --- /dev/null +++ b/lab-shiv/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/lab-shiv/lib/error-middleware.js b/lab-shiv/lib/error-middleware.js new file mode 100644 index 0000000..e69de29 From 4f44bc02e1e3fb97bcd45730b6b0b745ddca2fc3 Mon Sep 17 00:00:00 2001 From: Shiv Unadkat Date: Tue, 28 Feb 2017 17:46:05 -0800 Subject: [PATCH 4/6] full dissection of error-middleware complete --- lab-shiv/lib/error-middleware.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lab-shiv/lib/error-middleware.js b/lab-shiv/lib/error-middleware.js index e69de29..cb51660 100644 --- a/lab-shiv/lib/error-middleware.js +++ b/lab-shiv/lib/error-middleware.js @@ -0,0 +1,21 @@ +'use strict'; + +const createError = require('http-errors'); +const debug = require('debug')('note: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(); +}; From 158647e0092c0b4fb1ab282a68429aab7771b418 Mon Sep 17 00:00:00 2001 From: Shiv Unadkat Date: Tue, 28 Feb 2017 18:37:50 -0800 Subject: [PATCH 5/6] dissection of server file complete --- lab-shiv/server.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 lab-shiv/server.js diff --git a/lab-shiv/server.js b/lab-shiv/server.js new file mode 100644 index 0000000..5aab3f8 --- /dev/null +++ b/lab-shiv/server.js @@ -0,0 +1,22 @@ +'use strict'; + +const morgan = require('morgan'); +const express = require('express'); +const createError = require('http-errors'); +const debug = require('debug')('note:server'); + +const cors = require('./lib/cors-middleware.js'); +const noteRouter = require('./route/note-router.js'); +const errors = require('./lib/errors-middleware.js'); + +const PORT = process.env.PORT || 3000; +const app = express(); + +app.use(morgan('dev')); +app.use(cors); +app.use(noteRouter); +app.use(errors); + +app.listen(PORT, () => { + console.log(`server up: ${PORT}`); +}); From c1e9770292ac0bdba7272fbffd1ce0bea2fdb799 Mon Sep 17 00:00:00 2001 From: shivprogrammer Date: Fri, 28 Apr 2017 09:07:04 -0700 Subject: [PATCH 6/6] all tests passing --- lab-shiv/README.md | 8 +- lab-shiv/lib/error-middleware.js | 4 +- lab-shiv/lib/storage.js | 54 +++++++++++++ lab-shiv/model/leader.js | 57 ++++++++++++++ lab-shiv/package.json | 8 +- lab-shiv/route/leader-router.js | 41 ++++++++++ lab-shiv/route/note-route.js | 41 ---------- lab-shiv/server.js | 9 ++- lab-shiv/test/leader-route-test.js | 118 +++++++++++++++++++++++++++++ 9 files changed, 287 insertions(+), 53 deletions(-) create mode 100644 lab-shiv/lib/storage.js create mode 100644 lab-shiv/model/leader.js create mode 100644 lab-shiv/route/leader-router.js delete mode 100644 lab-shiv/route/note-route.js create mode 100644 lab-shiv/test/leader-route-test.js diff --git a/lab-shiv/README.md b/lab-shiv/README.md index efca449..9b752af 100644 --- a/lab-shiv/README.md +++ b/lab-shiv/README.md @@ -1,4 +1,4 @@ -![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API +![CF](https://camo.githubuserpurpose.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API === ## To Submit this Assignment @@ -23,6 +23,6 @@ * Create a `cors-middleware` module that will allow for public use of your API * Create the `deleteItem` and `availIDs` methods and add them to your `storage` module * these methods should be used to delete a resource (`deleteItem`) and return an array of id's from persisted resource filenames (`availIDs`) - * Create the `updateNote`, `fetchNote`, and `fetchIDs` static methods as part of your `Note` model - * Create a series of `note-route-tests` to test your **GET**, **POST**, and **PUT** routes - * **hint:** *you'll want to use the `before` and `after` hooks provided by `mocha` in order to create a test note and delete the note after the test has completed* + * Create the `updateLeader`, `fetchLeader`, and `fetchIDs` static methods as part of your `leader` model + * Create a series of `leader-route-tests` to test your **GET**, **POST**, and **PUT** routes + * **hint:** *you'll want to use the `before` and `after` hooks provided by `mocha` in order to create a test leader and delete the leader after the test has completed* diff --git a/lab-shiv/lib/error-middleware.js b/lab-shiv/lib/error-middleware.js index cb51660..05ebde4 100644 --- a/lab-shiv/lib/error-middleware.js +++ b/lab-shiv/lib/error-middleware.js @@ -1,7 +1,7 @@ 'use strict'; const createError = require('http-errors'); -const debug = require('debug')('note:error-middleware'); +const debug = require('debug')('leader:error-middleware'); module.exports = function(err, req, res, next) { console.error(err.message); @@ -16,6 +16,6 @@ module.exports = function(err, req, res, next) { debug('server error'); err = createError(500, err.message); - res.status(err.status).send(err.name) + res.status(err.status).send(err.name); next(); }; diff --git a/lab-shiv/lib/storage.js b/lab-shiv/lib/storage.js new file mode 100644 index 0000000..4954f0d --- /dev/null +++ b/lab-shiv/lib/storage.js @@ -0,0 +1,54 @@ +'use strict'; + +const Promise = require('bluebird'); +const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'}); +const createError = require('http-errors'); +const debug = require('debug')('leader:storage'); + +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.message))); +}; + +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))); +}; + +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 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/lab-shiv/model/leader.js b/lab-shiv/model/leader.js new file mode 100644 index 0000000..21b22b0 --- /dev/null +++ b/lab-shiv/model/leader.js @@ -0,0 +1,57 @@ +'use strict'; + +const uuid = require('node-uuid'); +const createError = require('http-errors'); +const debug = require('debug')('leader:leader'); +const storage = require('../lib/storage.js'); + +const Leader = module.exports = function(name, purpose) { + debug('leader constructor'); + + if (!name) throw createError(400, 'expected name'); + if (!purpose) throw createError(400, 'expected purpose'); + + this.id = uuid.v1(); + this.name = name; + this.purpose = purpose; +}; + +Leader.createLeader = function(_leader) { + debug('createLeader'); + + try { + let leader = new Leader(_leader.name, _leader.purpose); + return storage.createItem('leader', leader); + } catch (err) { + return Promise.reject(err); + } +}; + +Leader.fetchLeader = function(id) { + debug('fetchLeader'); + return storage.fetchItem('leader', id); +}; + +Leader.updateLeader = function(id, _leader) { + debug('updateLeader'); + + return storage.fetchItem('leader', id) + .catch( err => Promise.reject(createError(404, err.message))) + .then( leader => { + for (var prop in leader) { + if (prop === 'id') continue; + if (_leader[prop]) leader[prop] = _leader[prop]; + } + return storage.createItem('leader', leader); + }); +}; + +Leader.deleteLeader = function(id) { + debug('deleteLeader'); + return storage.deleteItem('leader', id); +}; + +Leader.fetchIDs = function() { + debug('fetchIDs'); + return storage.availIDs('leader'); +}; diff --git a/lab-shiv/package.json b/lab-shiv/package.json index a49033e..eeab7db 100644 --- a/lab-shiv/package.json +++ b/lab-shiv/package.json @@ -1,10 +1,10 @@ { "name": "12-express_middleware", "version": "1.0.0", - "description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API\r ===", + "description": "![CF](https://camo.githubuserpurpose.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API\r ===", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "test" }, "repository": { "type": "git", @@ -31,5 +31,9 @@ "chai": "^3.5.0", "mocha": "^3.2.0", "superagent": "^3.5.0" + }, + "scripts": { + "start": "DEBUG='leader*' node server.js", + "test": "DEBUG='leader*' ./node_modules/mocha/bin/mocha" } } diff --git a/lab-shiv/route/leader-router.js b/lab-shiv/route/leader-router.js new file mode 100644 index 0000000..308af64 --- /dev/null +++ b/lab-shiv/route/leader-router.js @@ -0,0 +1,41 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const debug = require('debug')('leader:leader-router'); +const Leader = require('../model/leader.js'); +const leaderRouter = new Router(); + +leaderRouter.post('/api/leader', jsonParser, function(req, res, next) { + debug('POST: /api/leader'); + + Leader.createLeader(req.body) + .then( leader => res.json(leader)) + .catch( err => next(err)); +}); + +leaderRouter.get('/api/leader/:id', function(req, res, next) { + debug('GET: /api/leader/:id'); + + Leader.fetchLeader(req.params.id) + .then( leader => res.json(leader)) + .catch( err => next(err)); +}); + +leaderRouter.get('/api/leader', function(req, res, next) { + debug('GET: /api/leader'); + + Leader.fetchIDs() + .then( ids => res.json(ids)) + .catch(next); +}); + +leaderRouter.put('/api/leader', jsonParser, function(req, res, next) { + debug('PUT: /api/leader'); + + Leader.updateLeader(req.query.id, req.body) + .then( leader => res.json(leader)) + .catch(next); +}); + +module.exports = leaderRouter; diff --git a/lab-shiv/route/note-route.js b/lab-shiv/route/note-route.js deleted file mode 100644 index b326352..0000000 --- a/lab-shiv/route/note-route.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict'; - -const Router = require('express').Router; -const jsonParser = require('bodyParser').json(); -const debug = require('debug')('note:note-router'); -const Note = require('../model/note.js'); -const noteRouter = new Router(); - -noteRouter.post('/api/note', jsonParser, function(res, req, next) { - debug ('POST: /api/note'); - - Note.createNote(req.body) - .then( note => res.json(note)) - .catch(next); -}); - -noteRouter.get('/api/note/:id', function(res, req, next) { - debug('GET: /api/note/:id'); - - Note.fetchNote(req.params.id) - .then( note => res.json(note)) - .catch(next); -}); - -noteRouter.get('/api/note', function(res, req, next) { - debug('GET: /api/note'); - - Note.fetchIDs() - .then( ids => res.json(ids)) - .catch(next); -}); - -noteRouter.put('/api/note', jsonParser, function(res, req, next) { - debug('PUT: /api/note'); - - Note.updateNote(req.query.id, req.body) - .then( note => res.json(note)) - .catch(next); -}); - -module.exports = noteRouter; diff --git a/lab-shiv/server.js b/lab-shiv/server.js index 5aab3f8..dd5528b 100644 --- a/lab-shiv/server.js +++ b/lab-shiv/server.js @@ -1,20 +1,21 @@ + 'use strict'; const morgan = require('morgan'); const express = require('express'); const createError = require('http-errors'); -const debug = require('debug')('note:server'); +const debug = require('debug')('leader:server'); +const leaderRouter = require('./route/leader-router.js'); const cors = require('./lib/cors-middleware.js'); -const noteRouter = require('./route/note-router.js'); -const errors = require('./lib/errors-middleware.js'); +const errors = require('./lib/error-middleware.js'); const PORT = process.env.PORT || 3000; const app = express(); app.use(morgan('dev')); app.use(cors); -app.use(noteRouter); +app.use(leaderRouter); app.use(errors); app.listen(PORT, () => { diff --git a/lab-shiv/test/leader-route-test.js b/lab-shiv/test/leader-route-test.js new file mode 100644 index 0000000..398e63b --- /dev/null +++ b/lab-shiv/test/leader-route-test.js @@ -0,0 +1,118 @@ +'use strict'; + +const expect = require('chai').expect; +const request = require('superagent'); +const Leader = require('../model/leader.js'); +const url = 'http://localhost:3000'; + +require('../server.js'); + +const exampleLeader = { + name: 'shivvy', + purpose: 'to culitvate superintelligence' +}; + +describe('leader Routes', function() { + + describe('GET: /api/leader', function() { + describe('with a valid id', function() { + before( done => { + Leader.createLeader(exampleLeader) + .then(leader => { + this.tempLeader = leader; + done(); + }) + .catch( err => done(err)); + }); + + after( done => { + Leader.deleteLeader(this.tempLeader.id) + .then( ()=> done()) + .catch( err => done(err)); + }); + + it('should return a leader', done => { + request.get(`${url}/api/leader/${this.tempLeader.id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.id).to.equal(this.tempLeader.id); + expect(res.body.name).to.equal(this.tempLeader.name); + expect(res.body.purpose).to.equal(this.tempLeader.purpose); + done(); + }); + }); + + describe('with an invalid id', function() { + it('should respond with a 404 status code', done => { + request.get(`${url}/api/leader/123456789`) + .end((err, res) => { + expect(res.status).to.equal(404); + done(); + }); + }); + }); + }); + }); + + describe('POST: /api/leader', function() { + describe('with a valid body', function() { + after( done => { + if (this.tempLeader) { + Leader.deleteLeader(this.tempLeader.id) + .then( ()=> done()) + .catch( err => done(err)); + } + }); + + it('should return a leader', done => { + request.post(`${url}/api/leader`) + .send(exampleLeader) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.name).to.equal(exampleLeader.name); + expect(res.body.purpose).to.equal(exampleLeader.purpose); + this.tempLeader = res.body; + done(); + }); + }); + }); + }); + + describe('PUT: /api/leader', function() { + describe('with a valid id and body', function() { + before( done => { + Leader.createLeader(exampleLeader) + .then( leader => { + this.tempLeader = leader; + done(); + }) + .catch( err => done(err)); + }); + + after( done => { + if (this.tempLeader) { + Leader.deleteLeader(this.tempLeader.id) + .then( ()=> done()) + .catch(done); + } + }); + + it('should return a leader', done => { + let updateLeader = { name: 'new name', purpose: 'new purpose' }; + request.put(`${url}/api/leader?id=${this.tempLeader.id}`) + .send(updateLeader) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.id).to.equal(this.tempLeader.id); + for (var prop in updateLeader) { + expect(res.body[prop]).to.equal(updateLeader[prop]); + } + done(); + }); + }); + }); + }); +});