Refactor consumer tests

Author: simov

test/consumer/middleware.js

@@ -13,7 +13,7 @@ var url = {
 }
 
 var provider = require('./util/provider')
-var client = require('./util/koa-mount')
+var client = require('./util/client')
 
 
 describe('middleware', () => {
@@ -40,7 +40,7 @@ describe('middleware', () => {
       }
     }
 
-    ;['mount', 'nomount'].forEach((name) => {
+    ;['koa', 'koa-mount'].forEach((name) => {
       describe(name, () => {
         before(async () => {
           var obj = await client[name](config, port.app)

test/consumer/util/client.js

@@ -9,6 +9,7 @@ var bodyParser = require('body-parser')
 var Koa = require('koa')
 var koasession = require('koa-session')
 var koabody = require('koa-bodyparser')
+var mount = require('koa-mount')
 var convert = require('koa-convert')
 var koaqs = require('koa-qs')
 
@@ -31,23 +32,16 @@ Koa = function () {
   return app
 }
 
-
 module.exports = {
   express: (config, port) => new Promise((resolve) => {
     var grant = Grant.express()(config)
 
     var app = express()
     app.use(bodyParser.urlencoded({extended: true}))
-    app.use(session({secret: 'grant', saveUninitialized: true, resave: true}))
+    app.use(session({secret: 'grant', saveUninitialized: true, resave: false}))
     app.use(grant)
+    app.get('/', callback.express)
 
-    app.get('/', (req, res) => {
-      res.writeHead(200, {'content-type': 'application/json'})
-      res.end(JSON.stringify({
-        session: req.session.grant,
-        response: req.session.grant.response || req.query,
-      }))
-    })
     var server = app.listen(port, () => resolve({grant, server, app}))
   }),
   koa: (config, port) => new Promise((resolve) => {
@@ -59,17 +53,20 @@ module.exports = {
     app.use(koabody())
     app.use(grant)
     koaqs(app)
+    app.use(callback.koa)
 
-    app.use(function* () {
-      if (this.path === '/') {
-        this.response.status = 200
-        this.set('content-type', 'application/json')
-        this.body = JSON.stringify({
-          session: this.session.grant,
-          response: this.session.grant.response || this.request.query,
-        })
-      }
-    })
+    var server = app.listen(port, () => resolve({grant, server, app}))
+  }),
+  'koa-mount': (config, port) => new Promise((resolve) => {
+    var grant = Grant.koa()(config)
+
+    var app = new Koa()
+    app.keys = ['grant']
+    app.use(koasession(app))
+    app.use(koabody())
+    app.use(mount(grant))
+    koaqs(app)
+    app.use(callback.koa)
 
     var server = app.listen(port, () => resolve({grant, server, app}))
   }),
@@ -78,48 +75,61 @@ module.exports = {
 
     var server = new Hapi.Server()
     server.connection({host: 'localhost', port})
-
-    server.route({method: 'GET', path: '/', handler: (req, res) => {
-      var parsed = url.parse(req.url, false)
-      var query = qs.parse(parsed.query)
-      res({
-        session: (req.session || req.yar).get('grant'),
-        response: (req.session || req.yar).get('grant').response || query
-      })
-    }})
+    server.route({method: 'GET', path: '/', handler: callback.hapi})
 
     server.register([
       {register: grant},
       {register: yar, options: {cookieOptions:
         {password: '01234567890123456789012345678912', isSecure: false}}}
-    ], (err) => {
-      if (err) {
-        done(err)
-        return
-      }
-
-      server.start(() => resolve({grant, server}))
-    })
+    ],
+    () => server.start(() => resolve({grant, server})))
   }),
   hapi17: (config, port) => new Promise((resolve) => {
     var grant = Grant.hapi()(config)
 
     var server = new Hapi.Server({host: 'localhost', port})
-    server.route({method: 'GET', path: '/', handler: (req, res) => {
-      var query = qs.parse(req.query)
-      return res.response({
-        session: (req.session || req.yar).get('grant'),
-        response: (req.session || req.yar).get('grant').response || query,
-      })
-    }})
+    server.route({method: 'GET', path: '/', handler: callback.hapi17})
 
     server.register([
       {plugin: grant},
       {plugin: yar, options: {cookieOptions:
         {password: '01234567890123456789012345678912', isSecure: false}}}
     ])
-      .then(() => {
-        server.start().then(() => resolve({grant, server}))
-      })
+    .then(() => server.start().then(() => resolve({grant, server})))
   }),
 }
+
+var callback = {
+  express: (req, res) => {
+    res.writeHead(200, {'content-type': 'application/json'})
+    res.end(JSON.stringify({
+      session: req.session.grant,
+      response: req.session.grant.response || req.query,
+    }))
+  },
+  koa: function* () {
+    if (this.path === '/') {
+      this.response.status = 200
+      this.set('content-type', 'application/json')
+      this.body = JSON.stringify({
+        session: this.session.grant,
+        response: this.session.grant.response || this.request.query,
+      })
+    }
+  },
+  hapi: (req, res) => {
+    var parsed = url.parse(req.url, false)
+    var query = qs.parse(parsed.query)
+    res({
+      session: (req.session || req.yar).get('grant'),
+      response: (req.session || req.yar).get('grant').response || query
+    })
+  },
+  hapi17: (req, res) => {
+    var query = qs.parse(req.query)
+    return res.response({
+      session: req.yar.get('grant'),
+      response: req.yar.get('grant').response || query,
+    })
+  }
+}