From e2fc08cb15a3e449563d6777a08e033c468fa8ce Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Mon, 16 Nov 2020 00:35:09 +0100
Subject: [PATCH] app-backend: fix tests

---
 plugins/app-backend/src/lib/config.test.ts    | 45 ++++++++++++++-----
 plugins/app-backend/src/lib/config.ts         |  7 ++-
 .../app-backend/src/service/router.test.ts    |  5 ++-
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/plugins/app-backend/src/lib/config.test.ts b/plugins/app-backend/src/lib/config.test.ts
index 475f72f3b1..95b34c8422 100644
--- a/plugins/app-backend/src/lib/config.test.ts
+++ b/plugins/app-backend/src/lib/config.test.ts
@@ -43,11 +43,23 @@ describe('injectConfig', () => {
     jest.resetAllMocks();
   });
 
-  it('should not inject without config', async () => {
+  it('should inject without config', async () => {
+    fsMock.readdir.mockResolvedValue(['main.js']);
+    readFileMock.mockImplementation(
+      async () => '"__APP_INJECTED_RUNTIME_CONFIG__"',
+    );
     await injectConfig(baseOptions);
-    expect(fsMock.readdir).toHaveBeenCalledTimes(0);
-    expect(fsMock.readFile).toHaveBeenCalledTimes(0);
-    expect(fsMock.writeFile).toHaveBeenCalledTimes(0);
+    expect(fsMock.readdir).toHaveBeenCalledTimes(1);
+    expect(fsMock.readFile).toHaveBeenCalledTimes(1);
+    expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
+    expect(fsMock.writeFile).toHaveBeenCalledWith(
+      resolvePath(MOCK_DIR, 'main.js'),
+      '/*__APP_INJECTED_CONFIG_MARKER__*/"[]"/*__INJECTED_END__*/',
+      'utf8',
+    );
+
+    // eslint-disable-next-line no-eval
+    expect(JSON.parse(eval(fsMock.writeFile.mock.calls[0][1]))).toEqual([]);
   });
 
   it('should find the correct file to inject', async () => {
@@ -83,14 +95,19 @@ describe('injectConfig', () => {
     expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
     expect(fsMock.writeFile).toHaveBeenCalledWith(
       resolvePath(MOCK_DIR, 'main.js'),
-      '/*__APP_INJECTED_CONFIG_MARKER__*/"{\\"x\\":0}"/*__INJECTED_END__*/',
+      '/*__APP_INJECTED_CONFIG_MARKER__*/"[{\\"data\\":{\\"x\\":0},\\"context\\":\\"test\\"}]"/*__INJECTED_END__*/',
       'utf8',
     );
 
     // eslint-disable-next-line no-eval
-    expect(JSON.parse(eval(fsMock.writeFile.mock.calls[0][1]))).toEqual({
-      x: 0,
-    });
+    expect(JSON.parse(eval(fsMock.writeFile.mock.calls[0][1]))).toEqual([
+      {
+        data: {
+          x: 0,
+        },
+        context: 'test',
+      },
+    ]);
   });
 
   it('should re-inject config', async () => {
@@ -107,12 +124,14 @@ describe('injectConfig', () => {
     expect(fsMock.writeFile).toHaveBeenCalledTimes(1);
     expect(fsMock.writeFile).toHaveBeenCalledWith(
       resolvePath(MOCK_DIR, 'main.js'),
-      'JSON.parse(/*__APP_INJECTED_CONFIG_MARKER__*/"{\\"x\\":0}"/*__INJECTED_END__*/)',
+      'JSON.parse(/*__APP_INJECTED_CONFIG_MARKER__*/"[{\\"data\\":{\\"x\\":0},\\"context\\":\\"test\\"}]"/*__INJECTED_END__*/)',
       'utf8',
     );
 
     // eslint-disable-next-line no-eval
-    expect(eval(fsMock.writeFile.mock.calls[0][1])).toEqual({ x: 0 });
+    expect(eval(fsMock.writeFile.mock.calls[0][1])).toEqual([
+      { data: { x: 0 }, context: 'test' },
+    ]);
 
     readFileMock.mockResolvedValue(fsMock.writeFile.mock.calls[0][1]);
 
@@ -124,11 +143,13 @@ describe('injectConfig', () => {
     expect(fsMock.writeFile).toHaveBeenCalledTimes(2);
     expect(fsMock.writeFile).toHaveBeenLastCalledWith(
       resolvePath(MOCK_DIR, 'main.js'),
-      'JSON.parse(/*__APP_INJECTED_CONFIG_MARKER__*/"{\\"x\\":1,\\"y\\":2}"/*__INJECTED_END__*/)',
+      'JSON.parse(/*__APP_INJECTED_CONFIG_MARKER__*/"[{\\"data\\":{\\"x\\":1,\\"y\\":2},\\"context\\":\\"test\\"}]"/*__INJECTED_END__*/)',
       'utf8',
     );
 
     // eslint-disable-next-line no-eval
-    expect(eval(fsMock.writeFile.mock.calls[1][1])).toEqual({ x: 1, y: 2 });
+    expect(eval(fsMock.writeFile.mock.calls[1][1])).toEqual([
+      { data: { x: 1, y: 2 }, context: 'test' },
+    ]);
   });
 });
diff --git a/plugins/app-backend/src/lib/config.ts b/plugins/app-backend/src/lib/config.ts
index 82b431c33f..f076967280 100644
--- a/plugins/app-backend/src/lib/config.ts
+++ b/plugins/app-backend/src/lib/config.ts
@@ -28,8 +28,7 @@ type InjectOptions = {
 };
 
 /**
- * Injects config from APP_CONFIG_ env vars, replacing existing
- * injected config if it has already been injected.
+ * Injects configs into the app bundle, replacing any existing injected config.
  */
 export async function injectConfig(options: InjectOptions) {
   const { staticDir, logger, appConfigs } = options;
@@ -73,6 +72,10 @@ type ReadOptions = {
   config: Config;
 };
 
+/**
+ * Read config from environment and process the backend config using the
+ * schema that is embedded in the frontend build.
+ */
 export async function readConfigs(options: ReadOptions): Promise<AppConfig[]> {
   const { env, appDistDir, config } = options;
 
diff --git a/plugins/app-backend/src/service/router.test.ts b/plugins/app-backend/src/service/router.test.ts
index b0cc3c59f7..35dd9287a6 100644
--- a/plugins/app-backend/src/service/router.test.ts
+++ b/plugins/app-backend/src/service/router.test.ts
@@ -22,7 +22,10 @@ import Router from 'express-promise-router';
 import request from 'supertest';
 import { createRouter } from './router';
 
-jest.mock('../lib/config', () => ({ injectEnvConfig: jest.fn() }));
+jest.mock('../lib/config', () => ({
+  injectConfig: jest.fn(),
+  readConfigs: jest.fn(),
+}));
 
 global.__non_webpack_require__ = {
   /* eslint-disable-next-line no-restricted-syntax */