Skip to content

Commit

Permalink
Merge branch 'koa2/deps'
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkHerhold committed Jun 3, 2018
2 parents 1a9a223 + c584008 commit 952deb6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 20 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
@@ -1,4 +1,5 @@
language: node_js
node_js:
- "6.0"
- "7.0"
- "6"
- "8"
- "10"
7 changes: 3 additions & 4 deletions package.json
Expand Up @@ -42,10 +42,9 @@
"@types/koa": "^2.0.39",
"koa": "^2.0.0",
"koa-router": "^7.0.1",
"lodash": "^3.3.1",
"mocha": "*",
"should": "*",
"supertest": "2.0.0"
"mocha": "5.2.0",
"should": "13.2.1",
"supertest": "3.1.0"
},
"contributors": [
{
Expand Down
25 changes: 11 additions & 14 deletions test/index.js
Expand Up @@ -9,7 +9,6 @@

'use strict';

const _ = require('lodash');
const assert = require('assert');
const fs = require('fs');
const http = require('http');
Expand All @@ -28,7 +27,7 @@ describe('koa-body', () => {
beforeEach((done) => {
app = new Koa();
database = {
"users": [
users: [
{
name: 'charlike',
followers: 10
Expand All @@ -42,15 +41,15 @@ describe('koa-body', () => {
router = Router()
.get('/users', (ctx, next) => {
if(ctx.request.body && ctx.request.body.name) {
ctx.body = _.findWhere(database.users, { name: ctx.request.body.name });
ctx.body = database.users.find(element => element.name === ctx.request.body.name);
ctx.status = 200;
return next();
}
ctx.status = 200;
ctx.body = database;
})
.get('/users/:user', (ctx, next) => {
user = _.findWhere(database.users, { name: ctx.request.body.name });
user = database.users.find(element => element.name === ctx.request.body.name);
ctx.status = 200;
ctx.body = user;
})
Expand All @@ -68,12 +67,10 @@ describe('koa-body', () => {
const user = ctx.params.user;
const multi = !!ctx.request.body.multi;
if (multi) {
database.users = database.users.filter( (element) => {
return element.name !== user;
});
database.users = database.users.filter(element => element.name !== user);
}
else {
const index = _.findIndex(database.users, { name: user });
const index = database.users.findIndex(element => element === user);
database.users.splice(index, 1);
}
ctx.status = 204;
Expand Down Expand Up @@ -115,7 +112,7 @@ describe('koa-body', () => {
.end( (err, res) => {
if (err) return done(err);

var mostRecentUser = _.last(database.users);
const mostRecentUser = database.users[database.users.length - 1];
res.body.fields.should.have.property('name', mostRecentUser.name);
res.body.fields.should.have.property('followers', mostRecentUser.followers);

Expand Down Expand Up @@ -250,7 +247,7 @@ describe('koa-body', () => {
.end( (err, res) => {
if (err) return done(err);

const mostRecentUser = _.last(database.users);
const mostRecentUser = database.users[database.users.length - 1];
res.body.should.have.property('name', mostRecentUser.name);
res.body.should.have.property('followers', mostRecentUser.followers);

Expand Down Expand Up @@ -280,7 +277,7 @@ describe('koa-body', () => {
.end( (err, res) => {
if (err) return done(err);

const mostRecentUser = _.last(database.users);
const mostRecentUser = database.users[database.users.length - 1];
res.text.should.equal(mostRecentUser);

done();
Expand All @@ -304,7 +301,7 @@ describe('koa-body', () => {
.expect(204)
.end( (err, res) => {
if (err) return done(err);
assert(_.findWhere(database.users, { name: 'charlike' }) !== undefined);
assert(database.users.find(element => element.name === 'charlike') !== undefined);
done();
});
});
Expand All @@ -320,7 +317,7 @@ describe('koa-body', () => {
.expect(204)
.end( (err, res) => {
if (err) return done(err);
assert(_.findWhere(database.users, { name: 'charlike' }) === undefined);
assert(database.users.find(element => element.name === 'charlike') === undefined);
done();
});
});
Expand All @@ -345,7 +342,7 @@ describe('koa-body', () => {
})
.expect(201)
.end((err, res) => {
const mostRecentUser = _.last(database.users);
const mostRecentUser = database.users[database.users.length - 1];
res.body.should.have.property('name', mostRecentUser.name);
res.body.name.should.equal('json');
done(err);
Expand Down

0 comments on commit 952deb6

Please sign in to comment.