Merge pull request #142 from UN-OCHA/test-fixes

Fix test shell script

bin/test.sh

@@ -15,6 +15,7 @@ where:
 KEEP=0
 FORCE_STOP_JEST='--forceExit'
 ONLY_CONTAINERS=0
+STOP_CONTAINERS=0
 COMMAND_ARGS=''
 
 function moveToTestDir {
@@ -52,21 +53,20 @@ while [ "$1" != "" ]; do
   shift
 done
 
+# ONLY_CONTAINERS must be 1 and STOP_CONTAINERS must be 0
+if [ $ONLY_CONTAINERS -eq 1 ] && [ "$STOP_CONTAINERS" -eq 1 ]; then
+  echo "$USAGE"
+  exit 1
+fi
+
 # STOP_CONTAINERS is a final option
-if [ "$STOP_CONTAINERS" -eq 1 ]; then
+if [[ "$STOP_CONTAINERS" -eq 1 ]]; then
   echo 'Stopping Docker containers'
   moveToTestDir
   docker compose down
   exit 0
 fi
 
-# ONLY_CONTAINERS must be 1 and STOP must be 0
-if [ $ONLY_CONTAINERS -eq 1 ] && [ "$STOP" -eq 1 ]; then
-  echo 'Invalid options - when using option -oc, option -ns must be used as well'
-  echo "$USAGE"
-  exit 1
-fi
-
 echo 'Starting Docker containers'
 moveToTestDir
 docker compose up -d

tests/compose.yml

@@ -9,4 +9,4 @@ services:
       - POSTGRES_USER=postgres
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
-      - ./migration/schema-2024-02-29.sql:/docker-entrypoint-initdb.d/init.sql
+      - ./migration/schema-2024-03-13.sql:/docker-entrypoint-initdb.d/init.sql

tests/migration/schema-2024-02-29.sql → tests/migration/schema-2024-03-13.sql

@@ -2772,8 +2772,7 @@ CREATE TABLE public."planVersion" (
     "updatedAt" timestamp with time zone NOT NULL,
     "lastPublishedReportingPeriodId" integer,
     "clusterSelectionType" character varying(255),
-    "isDisaggregationVisibleForCaseloads" boolean DEFAULT true,
-    "isDisaggregationVisibleForIndicators" boolean DEFAULT true
+    "visibilityPreferences" jsonb DEFAULT '{"isDisaggregationForCaseloads": true, "isDisaggregationForIndicators": true}'::jsonb NOT NULL
 );