update ava and tests

config/passport/local.js

@@ -6,7 +6,6 @@
 
 const mongoose = require('mongoose');
 const LocalStrategy = require('passport-local').Strategy;
-const config = require('../config');
 const User = mongoose.model('User');
 
 /**
@@ -23,7 +22,7 @@ module.exports = new LocalStrategy({
       select: 'name username email hashed_password salt'
     };
     User.load(options, function (err, user) {
-      if (err) return done(err)
+      if (err) return done(err);
       if (!user) {
         return done(null, false, { message: 'Unknown user' });
       }

config/routes.js

@@ -123,7 +123,7 @@ module.exports = function (app, passport) {
       return next();
     }
 
-    console.error(err.stack);
+    // console.error(err.stack);
 
     if (err.stack.includes('ValidationError')) {
       res.status(422).render('422', { error: err.stack });

package.json

@@ -35,7 +35,6 @@
     "express": "~4.13.3",
     "express-session": "~1.12.1",
     "forever": "~0.15.1",
-    "imager": "~1.0.0-alpha1",
     "method-override": "~2.3.5",
     "mongoose": "~4.2.7",
     "morgan": "~1.6.1",
@@ -55,7 +54,7 @@
     "winston": "~2.1.1"
   },
   "devDependencies": {
-    "ava": "~0.5.0",
+    "ava": "~0.6.0",
     "nodemon": "*",
     "supertest": "*"
   }

test/test-articles-create.js

@@ -11,6 +11,7 @@ const app = require('../server');
 const cleanup = require('./helper').cleanup;
 const User = mongoose.model('User');
 const Article = mongoose.model('Article');
+const agent = request.agent(app);
 
 const _user = {
   email: '[email protected]',
@@ -21,32 +22,23 @@ const _user = {
 
 
 test.before(cleanup);
-test.beforeEach(cleanup);
-
-
-// user login
-test.beforeEach(async t => {
-  const ctx = global.Promise.defer();
-  const agent = request.agent(app);
+test.before(async t => {
   const user = new User(_user);
+  return await user.save(t.end);
+});
 
-  user.save().then(() => {
-    agent
-    .post('/users/session')
-    .field('email', _user.email)
-    .field('password', _user.password)
-    .expect('Location', '/')
-    .expect('Content-Type', /text/)
-    .end((err, res) => {
-      ctx.resolve(res.headers['set-cookie']);
-    });
-  });
-
-  t.context.agent = agent;
-  t.context.cookie = await ctx.promise;
-  t.end();
+test.beforeEach(t => {
+  agent
+  .post('/users/session')
+  .field('email', _user.email)
+  .field('password', _user.password)
+  .expect('Location', '/')
+  .expect('Content-Type', /text/)
+  .end(t.end);
 });
 
+test.after(cleanup);
+
 
 test('POST /articles - when not logged in - should redirect to /login', t => {
   request(app)
@@ -60,13 +52,12 @@ test('POST /articles - when not logged in - should redirect to /login', t => {
 
 
 test('POST /articles - invalid form - should respond with error', t => {
-  t.context.agent
+  agent
   .post('/articles')
   .field('title', '')
   .field('body', 'foo')
-  .set('cookie', t.context.cookie)
   .expect('Content-Type', /text/)
-  .expect(302)
+  .expect(422)
   .expect(/Article title cannot be blank/)
   .end(async err => {
     const count = await Article.count().exec();
@@ -78,11 +69,10 @@ test('POST /articles - invalid form - should respond with error', t => {
 
 
 test('POST /articles - valid form - should redirect to the new article page', t => {
-  t.context.agent
+  agent
   .post('/articles')
   .field('title', 'foo')
   .field('body', 'bar')
-  .set('cookie', t.context.cookie)
   .expect('Content-Type', /plain/)
   .expect('Location', /\/articles\//)
   .expect(302)

test/_test-users-create.js → test/test-users-create.js

@@ -11,7 +11,8 @@ const app = require('../server');
 const cleanup = require('./helper').cleanup;
 const User = mongoose.model('User');
 
-test.beforeEach(cleanup);
+test.before(cleanup);
+test.after(cleanup);
 
 test('no email - should respond with errors', t => {
   request(app)
@@ -68,5 +69,3 @@ test('valid signup - should redirect to /', t => {
     t.end();
   });
 });
-
-test.afterEach(cleanup);