try again

Author: sugat009

configurator/config/index.js

@@ -2,9 +2,10 @@ const dotenv = require('dotenv');
 const path = require('path');
 
 const isDocker = process.env.DOCKER_ENV === 'true';
+const isTest = process.env.NODE_ENV === 'integration';
 
-if (!isDocker) {
-  const envPath = path.resolve(__dirname, '../../.env');
+if (!isDocker && !isTest) {
+  const envPath = path.resolve(__dirname, '../.env');
   const res = dotenv.config({ path: envPath });
 
   if (res.error) {
@@ -23,8 +24,8 @@ const getEnv = (key) => {
 };
 
 const OPENHIM_API_URL = getEnv('OPENHIM_API_URL');
-const OPENHIM_API_USERNAME = getEnv('OPENHIM_ROOT_USERNAME');
-const OPENHIM_API_PASSWORD = getEnv('OPENHIM_ROOT_PASSWORD');
+const OPENHIM_API_USERNAME = getEnv('OPENHIM_USERNAME');
+const OPENHIM_API_PASSWORD = getEnv('OPENHIM_PASSWORD');
 const OPENHIM_CLIENT_PASSWORD = getEnv('OPENHIM_CLIENT_PASSWORD');
 const OPENHIM_USER_PASSWORD = getEnv('OPENHIM_USER_PASSWORD');
 

configurator/env.template

@@ -0,0 +1,7 @@
+COUCHDB_USER=admin
+COUCHDB_PASSWORD=password
+OPENHIM_API_URL=https://openhim-core:8080
+OPENHIM_PASSWORD=openhim-password
+OPENHIM_USERNAME=root@openhim.org
+OPENHIM_CLIENT_PASSWORD=interop-password
+OPENHIM_USER_PASSWORD=interop-password

docker/docker-compose.mediator.yml

@@ -7,21 +7,21 @@ services:
     ports:
       - "6000:6000"
     env_file:
-      - ../.env
+      - ../mediator/.env
     environment:
       - DOCKER_ENV=true
     depends_on:
       - configurator
     restart: 'unless-stopped'
     networks:
       - cht-net
-    
+
   configurator:
     build:
       context: ../
       dockerfile: ./configurator/Dockerfile
     env_file:
-      - ../.env
+      - ../configurator/.env
     environment:
       - DOCKER_ENV=true
     networks:

mediator/config/index.ts

@@ -2,9 +2,10 @@ import * as dotenv from 'dotenv';
 import path from 'path';
 
 const isDocker = process.env.DOCKER_ENV === 'true';
+const isTest = process.env.NODE_ENV === 'integration';
 
-if (!isDocker) {
-  const envPath = path.resolve(__dirname, '../../.env');
+if (!isDocker && !isTest) {
+  const envPath = path.resolve(__dirname, '../.env');
   const res = dotenv.config({
     path: envPath
   });

.env.example mediator/env.template.env.example renamed to mediator/env.template

@@ -1,14 +1,10 @@
 OPENHIM_USERNAME=interop@openhim.org
 OPENHIM_PASSWORD=interop-password
 OPENHIM_API_URL=https://openhim-core:8080
-OPENHIM_ROOT_USERNAME=root@openhim.org
-OPENHIM_ROOT_PASSWORD=openhim-password
-OPENHIM_USER_PASSWORD=interop-password
-OPENHIM_CLIENT_PASSWORD=interop-password
 PORT=6000
 FHIR_URL=http://openhim-core:5001/fhir
 FHIR_USERNAME=interop-client
 FHIR_PASSWORD=interop-password
-CHT_URL=http://nginx
-CHT_USERNAME=medic
+CHT_URL=https://nginx
+CHT_USERNAME=admin
 CHT_PASSWORD=password

mediator/jest.config.js mediator/jest.base.config.jsmediator/jest.config.js renamed to mediator/jest.base.config.js

@@ -11,5 +11,4 @@ module.exports = {
   testPathIgnorePatterns: [
     '<rootDir>/dist/',
   ],
-  setupFilesAfterEnv: ['./jest.setup.ts'],
 };

mediator/jest.e2e.config.js

@@ -0,0 +1,10 @@
+const baseConfig = require('./jest.base.config.js');
+
+module.exports = {
+  ...baseConfig,
+  displayName: 'e2e',
+  testMatch: [
+    '<rootDir>/test/**/*.spec.ts',
+  ],
+  // Note: setupFilesAfterEnv is not included here
+};

mediator/jest.setup.ts

@@ -1,5 +1,3 @@
-import * as dotenv from 'dotenv';
-
 jest.mock('dotenv', () => ({
   config: jest.fn(() => {
     // Set the environment variables you need for your tests

mediator/jest.unit.config.js

@@ -0,0 +1,11 @@
+const baseConfig = require('./jest.base.config.js');
+
+module.exports = {
+  ...baseConfig,
+  displayName: 'unit',
+  testMatch: [
+    '<rootDir>/src/**/*.spec.ts',
+    '!<rootDir>/test/**/*',
+  ],
+  setupFilesAfterEnv: ['./jest.setup.ts'],
+};

mediator/package.json

@@ -11,7 +11,7 @@
     "test:watch": "jest --watch",
     "coverage": "jest --coverage",
     "clean": "rm -rf ./dist",
-    "unit-test": "jest src/",
+    "unit-test": "jest --config ./jest.unit.config.js",
     "e2e-test": "test/e2e-test.sh"
   },
   "repository": {