Merge pull request #2 from digicatapult/chore/template-content-updates

helper and test updates

helm/vitalam-service-template/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: vitalam-service-template
-appVersion: '0.0.1'
+appVersion: '0.0.2'
 description: A Helm chart for vitalam-service-template
-version: '0.0.1'
+version: '0.0.2'
 type: application
 maintainers:
   - name: digicatapult

helm/vitalam-service-template/values.yaml

@@ -3,5 +3,5 @@ config:
 image:
   repository: ghcr.io/digicatapult/vitalam-service-template
   pullPolicy: IfNotPresent
-  tag: 'v0.0.1'
+  tag: 'v0.0.2'
   pullSecrets: ['ghcr-digicatapult']

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digicatapult/vitalam-service-template",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Service for VITALam",
   "main": "app/index.js",
   "scripts": {

test/helper/routeHelper.js

@@ -0,0 +1,37 @@
+/* eslint no-console: "off" */
+const request = require('supertest')
+
+const { API_MAJOR_VERSION } = require('../../app/env')
+
+async function apiDocs({ app }) {
+  return request(app)
+    .get(`/${API_MAJOR_VERSION}/api-docs`)
+    .set('Accept', 'application/json')
+    .set('Content-Type', 'application/json')
+    .then((response) => {
+      return response
+    })
+    .catch((err) => {
+      console.error(`healthCheckErr ${err}`)
+      return err
+    })
+}
+
+async function healthCheck({ app }) {
+  return request(app)
+    .get('/health')
+    .set('Accept', 'application/json')
+    .set('Content-Type', 'application/json')
+    .then((response) => {
+      return response
+    })
+    .catch((err) => {
+      console.error(`healthCheckErr ${err}`)
+      return err
+    })
+}
+
+module.exports = {
+  apiDocs,
+  healthCheck,
+}

test/integration/docs.test.js

@@ -2,24 +2,22 @@ const { describe, before, it } = require('mocha')
 const jsonChai = require('chai-json')
 const { expect } = require('chai').use(jsonChai)
 
-const { setupServer } = require('../helpers/server')
-const { API_MAJOR_VERSION } = require('../../app/env')
+const { createHttpServer } = require('../../app/server')
+const { apiDocs } = require('../helper/routeHelper')
 
 describe('api-docs', function () {
-  const context = {}
+  let app
 
   before(async function () {
-    await setupServer(context)
-    context.response = await context.request.get(`/${API_MAJOR_VERSION}/api-docs`)
+    app = await createHttpServer()
   })
 
-  it('should return 200', function () {
-    expect(context.response.status).to.equal(200)
-  })
+  it('should return 200', async function () {
+    const actualResult = await apiDocs(app)
 
-  it('successfully returns the api docs json', function () {
-    expect(context.response.body).to.be.a.jsonObj()
-    expect(JSON.stringify(context.response.body)).to.include('openapi')
-    expect(JSON.stringify(context.response.body)).to.include('info')
+    expect(actualResult.status).to.equal(200)
+    expect(actualResult.body).to.be.a.jsonObj()
+    expect(JSON.stringify(actualResult.body)).to.include('openapi')
+    expect(JSON.stringify(actualResult.body)).to.include('info')
   })
 })

test/integration/httpServer.test.js

@@ -1,22 +1,22 @@
-const { describe, before, it } = require('mocha')
+const { describe, before, test } = require('mocha')
 const { expect } = require('chai')
 
-const { setupServer } = require('../helpers/server')
+const { createHttpServer } = require('../../app/server')
 const { API_VERSION } = require('../../app/env')
+const { healthCheck } = require('../helper/routeHelper')
 
 describe('health', function () {
-  const context = {}
+  let app
 
   before(async function () {
-    await setupServer(context)
-    context.response = await context.request.get('/health')
+    app = await createHttpServer()
   })
 
-  it('should return 200', function () {
-    expect(context.response.status).to.equal(200)
-  })
+  test('health check', async function () {
+    const expectedResult = { status: 'ok', version: API_VERSION }
 
-  it('should return success', function () {
-    expect(context.response.body).to.deep.equal({ version: API_VERSION, status: 'ok' })
+    const actualResult = await healthCheck(app)
+    expect(actualResult.status).to.equal(200)
+    expect(actualResult.body).to.deep.equal(expectedResult)
   })
 })