separate mock from app (#79)

.env.test

@@ -5,7 +5,6 @@ ALL_SCHEMA_ON=true
 
 # Mock server
 PORT_MOCK=4100
-ENABLE_MOCK_SERVER=true
 
 # Turn on all fields for local development
 MOCK_SERVER_COLLECTION=all #options: all, rural-payments-portal, release-1

app/index.js

@@ -5,11 +5,6 @@ import { apolloServer } from './graphql/server.js'
 import { server } from './server.js'
 import { logger } from './utils/logger.js'
 
-let mockServer
-if (process.env.ENABLE_MOCK_SERVER) {
-  mockServer = await import('../mocks/server.js')
-}
-
 const init = async () => {
   await apolloServer.start()
 
@@ -24,11 +19,6 @@ const init = async () => {
 
   await server.start()
   logger.info(`Server running on ${server.info.uri}`)
-
-  if (process.env.ENABLE_MOCK_SERVER && mockServer) {
-    const url = await mockServer.default.start()
-    logger.info(`Mock server running ${url}`)
-  }
 }
 
 process.on('unhandledRejection', err => {

jest.config.json

@@ -13,12 +13,6 @@
     "cobertura",
     "lcov"
   ],
-  "setupFiles": [
-    "<rootDir>/test/test-setup.js"
-  ],
-  "setupFilesAfterEnv": [
-    "<rootDir>/jest.init.js"
-  ],
   "reporters": [
     "default",
     [

mocks/collections.js

@@ -19,8 +19,6 @@ const release1Routes = [
   'rural-payments-organisation-get-by-sbi:default',
   'rural-payments-organisation-get-people-by-org-id:default',
 
-  'rural-payments-organisation-get-person-summary-by-person-id:default',
-
   'rural-payments-lms-get-covers-summary:default',
   'rural-payments-lms-get-land-covers:default',
   'rural-payments-lms-get-parcels:default',

mocks/index.js

@@ -1,3 +1,4 @@
 import server from './server.js'
 
-server.start()
+const url = await server.start()
+console.log(`Mock server running ${url}`)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcp-data-access-layer-api",
-  "version": "1.3.9",
+  "version": "1.3.10",
   "description": "Customer Registry GraphQL Service",
   "homepage": "https://github.com/DEFRA/fcp-data-access-layer-api",
   "main": "app/index.js",
@@ -15,6 +15,7 @@
     "start:debug": "nodemon --inspect-brk=0.0.0.0 --ext js --legacy-watch app/index.js",
     "start:dev": "nodemon -r dotenv/config --ext js,gql app/index.js",
     "start:watch": "nodemon --inspect=0.0.0.0 --ext js --legacy-watch app/index.js",
+    "start:mock": "nodemon ./mocks --watch ./mocks",
     "test": "NODE_OPTIONS=--experimental-vm-modules DOTENV_CONFIG_PATH=./.env.test jest --runInBand --detectOpenHandles --setupFiles dotenv/config",
     "test:contract": "NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=test/contract  --setupFiles dotenv/config",
     "test:integration": "NODE_OPTIONS=--experimental-vm-modules jest --testPathPattern=test/integration  --setupFiles dotenv/config",

test/integration/graphql/business-applications.test.js

@@ -1,6 +1,10 @@
 import { graphql } from 'graphql/index.js'
 import { schema } from '../../../app/graphql/server.js'
 import { fakeContext } from '../../test-setup.js'
+import mockServer from '../../../mocks/server'
+
+beforeAll(mockServer.start)
+afterAll(mockServer.stop)
 
 describe('Query business.applications', () => {
   it('should return application data', async () => {

test/integration/graphql/business.test.js

@@ -30,12 +30,16 @@ import {
   transformOrganisationToBusiness
 } from '../../../app/transformers/rural-payments/business.js'
 import { NotFound } from '../../../app/errors/graphql.js'
+import mockServer from '../../../mocks/server'
 
 const organisationFixture = organisationByOrgId('5565448')._data
 const { totalArea, totalParcels } = parcelSummary('5565448')
 const organisationCPHInfoFixture = organisationCPHInfo('5565448').data
 const organisationCPHFixture = organisationCPH('5565448').data
 
+beforeAll(mockServer.start)
+afterAll(mockServer.stop)
+
 describe('Query.business', () => {
   it('should return business data', async () => {
     const transformedOrganisation =

test/integration/graphql/customer.test.js

@@ -12,6 +12,9 @@ import { fakeContext } from '../../test-setup.js'
 
 const personFixture = personById({ id: '5007136' })
 
+beforeAll(mockServer.start)
+afterAll(mockServer.stop)
+
 describe('Query.customer', () => {
   it('should return customer data', async () => {
     const customerInfo = ruralPaymentsPortalCustomerTransformer(

test/integration/graphql/permissions.test.js

@@ -2,6 +2,10 @@ import { graphql } from 'graphql'
 
 import { schema } from '../../../app/graphql/server.js'
 import { fakeContext } from '../../test-setup.js'
+import mockServer from '../../../mocks/server'
+
+beforeAll(mockServer.start)
+afterAll(mockServer.stop)
 
 describe('Query.permissionGroups', () => {
   it('should return permissions', async () => {

test/integration/graphql/schema.test.js

@@ -4,6 +4,10 @@ import {
   getIntrospectionQuery,
   graphql
 } from 'graphql'
+import mockServer from '../../../mocks/server'
+
+beforeAll(mockServer.start)
+afterAll(mockServer.stop)
 
 describe('schema', () => {
   beforeEach(() => {