From 089291c7e53008d55f7b387a02fae464d2797ff6 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 8 Sep 2023 14:29:45 +0200
Subject: [PATCH] core-app-api: fix defaultConfigLoader tests

Co-authored-by: Camila Belo <camilaibs@gmail.com>
Co-authored-by: Philipp Hugenroth <philipph@spotify.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/app/defaultConfigLoader.test.ts       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/packages/core-app-api/src/app/defaultConfigLoader.test.ts b/packages/core-app-api/src/app/defaultConfigLoader.test.ts
index aebba92c43..7579e53dd2 100644
--- a/packages/core-app-api/src/app/defaultConfigLoader.test.ts
+++ b/packages/core-app-api/src/app/defaultConfigLoader.test.ts
@@ -14,40 +14,38 @@
  * limitations under the License.
  */
 
-import { defaultConfigLoader } from './defaultConfigLoader';
+import { defaultConfigLoaderSync } from './defaultConfigLoader';
 
 (process as any).env = { NODE_ENV: 'test' };
 const anyEnv = process.env as any;
 const anyWindow = window as any;
 
-describe('defaultConfigLoader', () => {
+describe('defaultConfigLoaderSync', () => {
   afterEach(() => {
     delete anyEnv.APP_CONFIG;
     delete anyWindow.__APP_CONFIG__;
   });
 
-  it('loads static config', async () => {
+  it('loads static config', () => {
     anyEnv.APP_CONFIG = [
       { data: { my: 'config' }, context: 'a' },
       { data: { my: 'override-config' }, context: 'b' },
     ];
 
-    const configs = await defaultConfigLoader();
+    const configs = defaultConfigLoaderSync();
     expect(configs).toEqual([
       { data: { my: 'config' }, context: 'a' },
       { data: { my: 'override-config' }, context: 'b' },
     ]);
   });
 
-  it('loads runtime config', async () => {
+  it('loads runtime config', () => {
     anyEnv.APP_CONFIG = [
       { data: { my: 'override-config' }, context: 'a' },
       { data: { my: 'config' }, context: 'b' },
     ];
 
-    const configs = await (defaultConfigLoader as any)(
-      '{"my":"runtime-config"}',
-    );
+    const configs = (defaultConfigLoaderSync as any)('{"my":"runtime-config"}');
     expect(configs).toEqual([
       { data: { my: 'override-config' }, context: 'a' },
       { data: { my: 'config' }, context: 'b' },
@@ -55,28 +53,28 @@ describe('defaultConfigLoader', () => {
     ]);
   });
 
-  it('fails to load invalid missing config', async () => {
-    await expect(defaultConfigLoader()).rejects.toThrow(
+  it('fails to load invalid missing config', () => {
+    expect(() => defaultConfigLoaderSync()).toThrow(
       'No static configuration provided',
     );
   });
 
-  it('fails to load invalid static config', async () => {
+  it('fails to load invalid static config', () => {
     anyEnv.APP_CONFIG = { my: 'invalid-config' };
-    await expect(defaultConfigLoader()).rejects.toThrow(
+    expect(() => defaultConfigLoaderSync()).toThrow(
       'Static configuration has invalid format',
     );
   });
 
-  it('fails to load bad runtime config', async () => {
+  it('fails to load bad runtime config', () => {
     anyEnv.APP_CONFIG = [{ data: { my: 'config' }, context: 'a' }];
 
-    await expect((defaultConfigLoader as any)('}')).rejects.toThrow(
+    expect(() => defaultConfigLoaderSync('}')).toThrow(
       'Failed to load runtime configuration, SyntaxError: Unexpected token } in JSON at position 0',
     );
   });
 
-  it('loads config from window.__APP_CONFIG__', async () => {
+  it('loads config from window.__APP_CONFIG__', () => {
     anyEnv.APP_CONFIG = [
       { data: { my: 'config' }, context: 'a' },
       { data: { my: 'override-config' }, context: 'b' },
@@ -84,7 +82,7 @@ describe('defaultConfigLoader', () => {
     const windowConfig = { app: { configKey: 'config-value' } };
     anyWindow.__APP_CONFIG__ = windowConfig;
 
-    const configs = await defaultConfigLoader();
+    const configs = defaultConfigLoaderSync();
 
     expect(configs).toEqual([
       ...anyEnv.APP_CONFIG,