fix: build for 5.22.0 (#130)

Author: Davidmattei

test/configs/elasticms/demo-dev.env

@@ -38,14 +38,14 @@ EMSCO_DATE_TIME_FORMAT='j/m/Y \a\t G:i'
 EMSCO_DATEPICKER_FORMAT='dd/mm/yyyy'
 EMSCO_DATEPICKER_WEEKSTART='1'
 EMSCO_DATEPICKER_DAYSOFWEEK_HIGHLIGHTED='[0,6]'
-EMSCO_ALLOW_USER_REGISTRATION='false'
-EMSCO_LOG_BY_PASS=true
 ###< Core ###
 
 ###> EMSCH ###
+EMSCH_ENV='default'
+EMSCH_ENVS='{"default":{"alias":"ems_promo_v2_preview","backend":"http://demo-admin","router": false, "default": true}}'
 EMSCH_TEMPLATE_EMS_LINK='@EMSCH/template/ems/{type}.ems_link.twig'
 EMSCH_LOCALES='["en","fr","nl","de"]'
 EMSCH_TRANSLATION_TYPE='label'
 EMSCH_ROUTE_TYPE='route'
-EMSCH_TEMPLATES='{"template":{"name":"name","code":"body"}}'
+EMSCH_TEMPLATES='{"template": {"name": "name","code": "body"},"template_ems": {"name": "name","code": "body"}}'
 ###< EMSCH ###

test/configs/elasticms/demo.env

@@ -38,14 +38,14 @@ EMSCO_DATE_TIME_FORMAT='j/m/Y \a\t G:i'
 EMSCO_DATEPICKER_FORMAT='dd/mm/yyyy'
 EMSCO_DATEPICKER_WEEKSTART='1'
 EMSCO_DATEPICKER_DAYSOFWEEK_HIGHLIGHTED='[0,6]'
-EMSCO_ALLOW_USER_REGISTRATION='false'
-EMSCO_LOG_BY_PASS=true
 ###< Core ###
 
 ###> EMSCH ###
+EMSCH_ENV='default'
+EMSCH_ENVS='{"default":{"alias":"ems_promo_v2_preview","backend":"http://demo-admin","router": false, "default": true}}'
 EMSCH_TEMPLATE_EMS_LINK='@EMSCH/template/ems/{type}.ems_link.twig'
 EMSCH_LOCALES='["en","fr","nl","de"]'
 EMSCH_TRANSLATION_TYPE='label'
 EMSCH_ROUTE_TYPE='route'
-EMSCH_TEMPLATES='{"template":{"name":"name","code":"body"}}'
+EMSCH_TEMPLATES='{"template":{"name":"name","code":"body"},"template_ems":{"name":"name","code":"body"}}'
 ###< EMSCH ###

test/configs/skeleton/zz-live.env

@@ -1,5 +1,5 @@
 ###> Apache ###
-SERVER_NAME='demo'
+SERVER_NAME='demo-live'
 SERVER_ALIASES='*'
 APACHE_CACHE_CONTROL='immutable, max-age=63072000, public'
 APACHE_ENVIRONMENTS='[]'
@@ -37,4 +37,4 @@ EMSCH_TEMPLATE_EMS_LINK='@EMSCH/template/ems/{type}.ems_link.twig'
 
 ###> EMS Form ###
 EMSF_LOAD_FROMJSON=true
-###< EMS Form ###
+###< EMS Form ###

test/docker-compose.yml

@@ -109,10 +109,8 @@ services:
     networks:
       default:
         aliases:
-          - demo-admin
           - demo-admin-dev
-          - demo-pgsql-admin
-          - demo-pgsql-admin-dev
+          - demo-admin
     container_name: ems
     environment:
       - AWS_S3_STORAGE_BUCKET_NAME=${BATS_S3_STORAGE_BUCKET_NAME}
@@ -137,12 +135,22 @@ services:
       - JOBS_ENABLED=${BATS_JOBS_ENABLED}
       - METRICS_ENABLED=${BATS_METRICS_ENABLED}
       - CLI_PHP_MEMORY_LIMIT=512M
+    volumes:
+      - ./demo/configs/admin:/opt/src/configs/admin
+      - ./demo/configs/document:/opt/src/configs/document
     command: ["wait-for-it", "${BATS_DB_HOST}:${BATS_DB_PORT}", "--", "/usr/bin/supervisord", "-c", "/etc/supervisord/supervisord.conf"]
     mem_limit: 512m
+    ports:
+      - "8881:9000"
 
   emsch:
     image: ${BATS_DOCKER_IMAGE_NAME}
     container_name: emsch
+    networks:
+      default:
+        aliases:
+          - demo-live
+          - demo-preview-dev
     environment:
       - APP_ENV=dev
       - REDIS_HOST=${BATS_REDIS_HOST}
@@ -168,15 +176,15 @@ services:
       - METRICS_ENABLED=${BATS_METRICS_ENABLED}
       - VARNISH_ENABLED=${BATS_VARNISH_ENABLED}
     volumes:
-      - ./demo/configs/admin:/opt/src/admin
-      - ./demo/configs/document:/opt/src/document
       - ./demo/dist:/opt/src/public/skeleton:ro
       - ./demo/skeleton:/opt/src/local/ems_promo_v2_preview
       - ./demo/skeleton:/opt/src/local/ems_promo_v2_live
       - ./demo/skeleton:/opt/src/local/skeleton
     mem_limit: 512m
+    ports:
+      - "8882:9000"
 
 networks:
   default:
-    external:
-      name: docker_default
+    name: docker_default
+    external: true

test/helpers/containers.bash

@@ -3,9 +3,9 @@
 # Removes container $1
 function container_clean {
   run ${BATS_CONTAINER_ENGINE} kill $1 &>/dev/null ||:
-  sleep .25s
+  sleep 25
   run ${BATS_CONTAINER_ENGINE} rm -vf $1 &>/dev/null ||:
-  sleep .25s
+  sleep 25
 }
 
 # get the ip of container $1
@@ -78,7 +78,7 @@ function container_wait_for_log {
   local -r container=$1
   local -ir timeout_sec=$2
   shift 2
-  retry $(( $timeout_sec * 2 )) .5s container_assert_log $container "$*"
+  retry $(( $timeout_sec * 2 )) 5 container_assert_log $container "$*"
 }
 
 # wait for a container to produce a given text in its command output
@@ -90,7 +90,7 @@ function container_wait_for_command {
   local -r cmd=$2
   local -ir timeout_sec=$3
   shift 3
-  retry $(( $timeout_sec * 2 )) .5s container_assert_command $container "$cmd" "$*"
+  retry $(( $timeout_sec * 2 )) 5 container_assert_command $container "$cmd" "$*"
 }
 
 # wait for a container healthy state
@@ -100,5 +100,5 @@ function container_wait_for_healthy {
   local -r container=$1
   local -ir timeout_sec=$2
   shift 2
-  retry $(( $timeout_sec * 2 )) .5s container_assert_healthy $container
-}
+  retry $(( $timeout_sec * 2 )) 0.5 container_assert_healthy $container
+}

test/helpers/tests.bash

@@ -1,7 +1,6 @@
 # Test if requirements are met
 (
 	type ${BATS_CONTAINER_ENGINE} &>/dev/null || ( echo "${BATS_CONTAINER_ENGINE} is not available"; exit 1 )
-    type ${BATS_CONTAINER_COMPOSE_ENGINE} &>/dev/null || ( echo "${BATS_CONTAINER_COMPOSE_ENGINE} is not available"; exit 1 )
 )>&2
 
 TEST_FILE=$(basename $BATS_TEST_FILENAME .bats)
@@ -59,4 +58,4 @@ function retry {
 
     echo "Command \"$@\" failed $attempts times. Status: $status. Output: $output" >&2
     false
-}
+}