refactor: refactor test cases to remove duplication

re #139

test/app-factory.test.js

@@ -59,12 +59,7 @@ describe('connect-flash middleware', () => {
 
   it('should be called once as app.use arg', () => {
     const flash = require('connect-flash')
-    const app = appFactoryRewire.__get__('app')
-    const AppFactory = appFactoryRewire.__get__('AppFactory')
-    const appUseSpy = sinon.spy(app, 'use')
-    const appInstance = new AppFactory()
-
-    appInstance.createApp()
+    const appUseSpy = spyOnAppUse()
 
     assertCalledWithFunctionAsArg(appUseSpy, flash())
     sinon.restore()

test/features/steps/enpoint-metric-steps.js

@@ -1,23 +1,16 @@
 const { Given, When, Then, BeforeStep, AfterStep } = require('@cucumber/cucumber')
 const chai = require('chai')
-const assert = chai.assert
-const chaiHttp = require('chai-http')
-chai.use(chaiHttp)
+const { setupServer } = require('../../helper')
 
-let app
+const assert = chai.assert
 let requester
 
 BeforeStep(async () => {
-  app = require('../../../server/app')
-  await app.on('appStarted', () => {
-    console.log('app started...')
-  })
-  requester = chai.request(app).keepOpen()
-  await app.rateLimiter.resetKey('::ffff:127.0.0.1')
+  requester = await setupServer()
 })
 
 AfterStep(async () => {
-  requester.close()
+  await requester.close()
 })
 
 Given('passport server is up and running', async () => {

test/features/steps/rate-limiting-steps.js

@@ -1,20 +1,14 @@
 const { Given, When, Then, AfterStep, BeforeStep } = require('@cucumber/cucumber')
 const chai = require('chai')
 const config = require('config')
+const { setupServer } = require('../../helper')
+
 const assert = chai.assert
-const chaiHttp = require('chai-http')
-chai.use(chaiHttp)
-let app
 let requester
 require('events').defaultMaxListeners = 100
 
 BeforeStep(async () => {
-  app = require('../../../server/app')
-  await app.on('appStarted', () => {
-    console.log('app started...')
-  })
-  requester = chai.request(app).keepOpen()
-  await app.rateLimiter.resetKey('::ffff:127.0.0.1')
+  requester = await setupServer()
 })
 
 AfterStep(async () => {

test/helper.js

@@ -4,6 +4,9 @@ const InitMock = require('./testdata/init-mock')
 const logger = require('../server/utils/logging')
 const config = require('config')
 const basicConfig = config.get('passportConfig')
+const chai = require('chai')
+const chaiHttp = require('chai-http')
+chai.use(chaiHttp)
 
 /**
  * Mocks external endpoints for app initalization
@@ -29,22 +32,13 @@ const configureLogger = () => {
 /**
  * Setup and start server for cucumber test
  */
-const setupServer = function () {
-  return new Promise((resolve, reject) => {
-    const InitMock = require('../test/testdata/init-mock')
-    const server = require('../server/app')
-
-    const initMock = new InitMock()
-    initMock.passportConfigEndpoint()
-    initMock.umaTokenEndpoint()
-    initMock.umaConfigurationEndpoint()
-
-    // waits for the server to start (app.listen)
-    server.on('appStarted', () => {
-      console.log('app started...')
-      return resolve()
-    })
+const setupServer = async function () {
+  const app = require('../server/app')
+  await app.on('appStarted', () => {
+    console.log('app started...')
   })
+  await app.rateLimiter.resetKey('::ffff:127.0.0.1')
+  return chai.request(app).keepOpen()
 }
 
 module.exports = {