Fix the tests

The postgres database is now a separate package so the tests have to be adjusted
jembi · Feb 2, 2024 · 59c1bc7 · 59c1bc7
1 parent 0243f7c
commit 59c1bc7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 37 deletions.
diff --git a/test/cucumber/features/cluster-mode/hapi-fhir.cluster.feature b/test/cucumber/features/cluster-mode/hapi-fhir.cluster.feature
@@ -6,23 +6,22 @@ Feature: Fhir Datastore HAPI-FHIR?
     When I launch the platform with params
     Then The service "postgres-1" should be started with 1 replica
     And The service "postgres-1" should be connected to the networks
-      | hapi-fhir_postgres_public | hapi-fhir_default | pg_backup |
+      | postgres_public | postgres_default | pg_backup |
     And The service "postgres-2" should be started with 1 replica
     And The service "postgres-2" should be connected to the networks
-      | hapi-fhir_default | pg_backup |
+      | postgres_default | pg_backup | postgres_public |
     And The service "postgres-3" should be started with 1 replica
     And The service "postgres-3" should be connected to the networks
-      | hapi-fhir_default | pg_backup |
-        And The service "postgres-3" should be started with 1 replica
+      | postgres_default | pg_backup | postgres_public |
     And The service "pgpool-1" should be connected to the networks
-      | hapi-fhir_default |
+      | postgres_default | postgres_public |
     And The service "pgpool-2" should be connected to the networks
-      | hapi-fhir_default |
+      | postgres_default | postgres_public |
     And The service "pgpool-3" should be connected to the networks
-      | hapi-fhir_default |
+      | postgres_default | postgres_public |
     And The service "hapi-fhir" should be started with 3 replicas
     And The service "hapi-fhir" should be connected to the networks
-      | mpi_public | hapi-fhir_public | hapi-fhir_default |
+      | mpi_public | hapi-fhir_public | hapi-fhir_default | postgres_public |
     And There should be 7 services
     And The service "hapi-fhir" should have healthy containers
 
@@ -49,4 +48,4 @@ Feature: Fhir Datastore HAPI-FHIR?
     And There should be 0 volume
     And There should be 0 config
     And There should not be network
-      | hapi-fhir_public | hapi-fhir_postgres_public | mpi_public | kafka_public | openhim_public |
+      | hapi-fhir_public | postgres_public | mpi_public | kafka_public | openhim_public |
diff --git a/test/cucumber/features/cluster-mode/keycloak.cluster.feature b/test/cucumber/features/cluster-mode/keycloak.cluster.feature
@@ -4,30 +4,30 @@ Feature: Identity Access Manager Keycloak?
   Scenario: Init Identity Access Manager Keycloak
     Given I use parameters "package init -n=identity-access-manager-keycloak --dev --env-file=.env.cluster"
     When I launch the platform with params
-    Then The service "keycloak-postgres-1" should be started with 1 replica
-    And The service "keycloak-postgres-1" should be connected to the networks
-      | keycloak_backup | keycloak_default |
-    And The service "keycloak-postgres-2" should be started with 1 replica
-    And The service "keycloak-postgres-2" should be connected to the networks
-      | keycloak_backup | keycloak_default |
-    And The service "keycloak-postgres-3" should be started with 1 replica
-    And The service "keycloak-postgres-3" should be connected to the networks
-      | keycloak_backup | keycloak_default |
+    Then The service "postgres-1" should be started with 1 replica
+    And The service "postgres-1" should be connected to the networks
+      | pg_backup | postgres_default | postgres_public |
+    And The service "postgres-2" should be started with 1 replica
+    And The service "postgres-2" should be connected to the networks
+      | pg_backup | poostgres_default | postgres_public |
+    And The service "postgres-3" should be started with 1 replica
+    And The service "postgres-3" should be connected to the networks
+      | pg_backup | poostgres_default | postgres_public |
     And The service "identity-access-manager-keycloak" should be started with 1 replicas
     And The service "identity-access-manager-keycloak" should be connected to the networks
-      | reverse-proxy_public | keycloak_public | keycloak_default |
+      | reverse-proxy_public | keycloak_public | keycloak_default | postgres_public |
     And There should be 4 services
     And The service "identity-access-manager-keycloak" should have healthy containers
 
   Scenario: Destroy Identity Access Manager Keycloak
     Given I use parameters "package destroy -n=identity-access-manager-keycloak --dev --env-file=.env.cluster"
     When I launch the platform with params
-    Then The service "keycloak-postgres-1" should be removed
-    And The service "keycloak-postgres-2" should be removed
-    And The service "keycloak-postgres-3" should be removed
+    Then The service "postgres-1" should be removed
+    And The service "postgres-2" should be removed
+    And The service "postgres-3" should be removed
     And The service "identity-access-manager-keycloak" should be removed
     And There should be 0 service
     And There should be 0 volume
     And There should be 0 config
     And There should not be network
-      | reverse-proxy_public | keycloak_public | keycloak_backup |
+      | reverse-proxy_public | keycloak_public | pg_backup | postgres_public| postgres_default |
diff --git a/test/cucumber/features/cluster-mode/santempi.cluster.feature b/test/cucumber/features/cluster-mode/santempi.cluster.feature
@@ -4,27 +4,27 @@ Feature: Client Registry JeMPI?
   Scenario: Init Client Registry JeMPI
     Given I use parameters "package init -n=client-registry-santempi --dev --env-file=.env.cluster"
     When I launch the platform with params
-    Then The service "santempi-psql-1" should be started with 1 replica
-    And The service "santempi-psql-2" should be started with 1 replica
-    And The service "santempi-psql-3" should be started with 1 replica
+    Then The service "postgres-1" should be started with 1 replica
+    And The service "postgres-2" should be started with 1 replica
+    And The service "postgres-3" should be started with 1 replica
     And The service "santedb-www" should be started with 1 replica
     And The service "santedb-www" should be connected to the networks
       | reverse-proxy_public | santempi_default |
     And The service "santedb-mpi" should be started with 1 replica
     And The service "santedb-mpi" should be connected to the networks
-      | reverse-proxy_public | mpi_public | santedb_public | santempi_default |
+      | reverse-proxy_public | mpi_public | santedb_public | santempi_default | postgres_public |
     And There should be 5 services
 
   Scenario: Destroy Client Registry JeMPI
     Given I use parameters "package destroy -n=client-registry-santempi --dev --env-file=.env.cluster"
     When I launch the platform with params
-    Then The service "santempi-psql-1" should be removed
-    And The service "santempi-psql-2" should be removed
-    And The service "santempi-psql-3" should be removed
+    Then The service "postgres-1" should be removed
+    And The service "postgres-2" should be removed
+    And The service "postgres-3" should be removed
     And The service "santedb-www" should be removed
     And The service "santedb-mpi" should be removed
     And There should be 0 service
     And There should be 0 volume
     And There should be 0 config
     And There should not be network
-      | reverse-proxy_public | mpi_public | santedb_public |
+      | reverse-proxy_public | mpi_public | santedb_public | postgres_public |
diff --git a/test/cucumber/features/single-mode/hapi-fhir.feature b/test/cucumber/features/single-mode/hapi-fhir.feature
@@ -9,9 +9,9 @@ Feature: Fhir Datastore HAPI-FHIR?
     And There should be 2 services
     And The service "hapi-fhir" should have healthy containers
     And The service "hapi-fhir" should be connected to the networks
-      | mpi_public | hapi-fhir_public | hapi-fhir_default |
+      | mpi_public | hapi-fhir_public | hapi-fhir_default | postgres_public |
     And The service "postgres-1" should be connected to the networks
-      | hapi-fhir_postgres_public | hapi-fhir_default | pg_backup | postgres_public |
+      | pg_backup | postgres_public |
     And There should be 1 volume
 
   Scenario: Init Message Bus Helper Hapi Proxy
@@ -32,4 +32,4 @@ Feature: Fhir Datastore HAPI-FHIR?
     And There should be 0 volume
     And There should be 0 config
     And There should not be network
-      | hapi-fhir_public | hapi-fhir_postgres_public | mpi_public | kafka_public | openhim_public | postgres_public |
+      | hapi-fhir_public | mpi_public | kafka_public | openhim_public | postgres_public |
diff --git a/test/cucumber/features/single-mode/keycloak.feature b/test/cucumber/features/single-mode/keycloak.feature
@@ -10,8 +10,8 @@ Feature: Identity Access Manager Keycloak?
     And The service "identity-access-manager-keycloak" should have healthy containers
     And The service "identity-access-manager-keycloak" should be connected to the networks
       | reverse-proxy_public | keycloak_public | keycloak_default | postgres_public |
-    And The service "keycloak-postgres-1" should be connected to the networks
-      | keycloak_backup | keycloak_default | postgres_public |
+    And The service "postgres-1" should be connected to the networks
+      | pg_backup | postgres_default | postgres_public |
     And There should be 1 volume
 
   Scenario: Destroy Identity Access Manager Keycloak
@@ -24,4 +24,4 @@ Feature: Identity Access Manager Keycloak?
     And There should be 0 volume
     And There should be 0 config
     And There should not be network
-      | reverse-proxy_public | keycloak_public | keycloak_backup | postgres_public |
+      | reverse-proxy_public | keycloak_public | pg_backup | postgres_public |