Merge pull request #138 from adhocteam/dcloud/split-docker-local-test

Create separate docker-compose file for running tests, add bin/run-tests command for easy testing

Author: dcloud

.circleci/config.yml

@@ -240,12 +240,12 @@ jobs:
       - run:
           name: Start up local server
           command: | # production style build (single BE server with static FE)
-            docker-compose -f docker-compose-test.yml run --rm server yarn install --production=false
-            docker-compose -f docker-compose-test.yml run --rm server yarn --cwd frontend install --production=false
-            docker-compose -f docker-compose-test.yml run --rm server yarn build
-            docker-compose -f docker-compose-test.yml run --rm server yarn --cwd frontend run build
-            docker-compose -f docker-compose-test.yml up -d
-            docker-compose -f docker-compose-test.yml exec server yarn db:migrate:ci
+            docker-compose -f docker-compose.dss.yml run --rm server yarn install --production=false
+            docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend install --production=false
+            docker-compose -f docker-compose.dss.yml run --rm server yarn build
+            docker-compose -f docker-compose.dss.yml run --rm server yarn --cwd frontend run build
+            docker-compose -f docker-compose.dss.yml up -d
+            docker-compose -f docker-compose.dss.yml exec server yarn db:migrate:ci
       - run:
           name: Pull OWASP ZAP docker image
           command: docker pull owasp/zap2docker-weekly

bin/run-tests

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "Running tests in using test config 'docker-compose.test.yml'"
+# Start containers
+docker-compose -f 'docker-compose.test.yml' up -d
+
+# Let postgres initialize
+echo "Give postgres a few seconds to start up..."
+sleep 5
+
+# Migrate and seed db
+docker exec test-backend bash -c "yarn db:migrate"
+docker exec test-backend bash -c "yarn db:seed;"
+
+# Test backend
+docker exec test-backend bash -c "yarn test:ci"
+
+# Test frontend
+docker exec test-backend bash -c "yarn --cwd frontend run test:ci"
+
+# Cleanup
+docker-compose \
+    -f 'docker-compose.test.yml' \
+    down --volumes

docker-compose-test.yml docker-compose.dss.yml

@@ -0,0 +1,38 @@
+version: "3.5"
+services:
+  test-backend:
+    build:
+      context: .
+    container_name: test-backend
+    command: yarn server
+    user: ${CURRENT_USER:-root}
+    depends_on:
+      - test-db
+    environment:
+      - POSTGRES_HOST=test-db
+    volumes:
+      - ".:/app:rw"
+    networks:
+      - ttadp-test
+  test-frontend:
+    build:
+      context: .
+    command: yarn start
+    user: ${CURRENT_USER:-root}
+    stdin_open: true
+    volumes:
+      - "./frontend:/app:rw"
+      - "./scripts:/app/scripts"
+    environment:
+      - BACKEND_PROXY=http://test-backend:8080
+    networks:
+      - ttadp-test
+  test-db:
+    image: postgres:12.4
+    container_name: test-db
+    env_file: .env
+    networks:
+      - ttadp-test
+# Use non-default network so we don't conflict with the developer environment
+networks:
+  ttadp-test:

docker-compose.test.yml

@@ -42,7 +42,7 @@
     "docker:deps": "docker-compose run --rm backend yarn install && docker-compose run --rm frontend yarn install",
     "docker:start": "docker-compose up",
     "docker:stop": "docker-compose down",
-    "docker:test": "docker-compose run --rm backend yarn test:ci && docker-compose run --rm frontend yarn test:ci",
+    "docker:test": "./bin/run-tests",
     "docker:test:be": "docker-compose run --rm backend yarn test",
     "docker:lint": "docker-compose run --rm backend yarn lint:ci && docker-compose run --rm frontend yarn lint:ci",
     "docker:shell:frontend": "docker-compose run --rm frontend /bin/bash",