Merge pull request #9 from BSStudio/maintenance/integration-test-refactor

Maintenance: Integration test refactor

Author: csikb

.circleci/config.yml

@@ -26,7 +26,7 @@ jobs:
       - checkout
       - setup_remote_docker:
           version: 19.03.13
-      - run: docker-compose up --build --abort-on-container-exit
+      - run: docker-compose -f ./docker-compose.test.yaml up --build --abort-on-container-exit
 workflows:
   version: 2
   build_and_test:

application/src/main/resources/application-ci.yml

@@ -0,0 +1,34 @@
+version: "3.8"
+services:
+  app:
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    environment:
+      robonauth.api-key: BSS
+      spring.data.mongodb.host: mongo
+      spring.rabbitmq.host: rabbit-mq
+    ports:
+    - 8080:8080
+  rabbit-mq:
+    image: rabbitmq:management-alpine
+    ports:
+    - 5672:5672
+    - 8081:15672
+  mongo:
+    image: mongo:4.4.2-bionic
+    ports:
+    - 27017:27017
+  integration-test:
+    build:
+      context: ./integration
+      dockerfile: Dockerfile
+    command: dockerize -wait tcp://mongo:27017 -wait tcp://app:8080 -wait tcp://rabbit-mq:5672 -timeout 10m sh -c "sleep 1m && yarn test"
+    environment:
+      HOST_NAME: http://app:8080
+      DB_HOST: mongodb://mongo:27017/
+      AMQP_HOST: amqp://rabbit-mq
+    depends_on:
+    - rabbit-mq
+    - app
+    - mongo

docker-compose.test.yaml

@@ -19,16 +19,3 @@ services:
     image: mongo:4.4.2-bionic
     ports:
     - 27017:27017
-  integration-test:
-    build:
-      context: ./integration
-      dockerfile: Dockerfile
-    command: dockerize -wait tcp://mongo:27017 -wait tcp://app:8080 -wait tcp://rabbit-mq:5672 -timeout 10m sh -c "sleep 1m && yarn test"
-    environment:
-      HOST_NAME: http://app:8080
-      DB_HOST: mongodb://mongo:27017/
-      AMQP_HOST: amqp://rabbit-mq
-    depends_on:
-    - rabbit-mq
-    - app
-    - mongo

docker-compose.yaml

@@ -306,7 +306,7 @@ describe('Test a happy path of events', () => {
             purgeQueue('speed.safetyCar.overtake'),
             purgeQueue('speed.timer'),
             purgeQueue('team.teamData')
-        ])
+        ]);
     });
     it('should contain no teams in the start', () => {
         return request(HOST)
@@ -326,7 +326,7 @@ describe('Test a happy path of events', () => {
                 expect(response.status).toBe(200)
                 expect(response.body).toStrictEqual(createdTeam)
             })
-            .then(_ => assertQueue('team.teamData', createdTeam))
+            .then(_ => assertQueue('team.teamData', createdTeam));
     });
     it('should display the new team', () => {
         return request(HOST)
@@ -368,7 +368,7 @@ describe('Test a happy path of events', () => {
                 expect(response.status).toBe(200)
                 expect(response.body).toStrictEqual(skillTimerStart)
             })
-            .then(_ => assertQueue('skill.timer', skillTimerStart))
+            .then(_ => assertQueue('skill.timer', skillTimerStart));
     });
     it('should stop the skill timer', () => {
         return request(HOST)
@@ -379,7 +379,7 @@ describe('Test a happy path of events', () => {
                 expect(response.status).toBe(200)
                 expect(response.body).toStrictEqual(skillTimerStop)
             })
-            .then(_ => assertQueue('skill.timer', skillTimerStop))
+            .then(_ => assertQueue('skill.timer', skillTimerStop));
     });
     it('should update team on gate enter', () => {
         return request(HOST)
@@ -448,7 +448,7 @@ describe('Test a happy path of events', () => {
                 expect(response.status).toBe(200)
                 expect(response.body).toStrictEqual(speedTimerStop)
             })
-            .then(_ => assertQueue('speed.timer', speedTimerStop))
+            .then(_ => assertQueue('speed.timer', speedTimerStop));
     });
     it('should update team after lap is completed', () => {
         return request(HOST)
@@ -507,6 +507,6 @@ describe('Test a happy path of events', () => {
             .then(_ => assertQueue('team.teamData', updatedTeamAfterEndResults));
     });
     afterAll(() => {
-        return cleanDB()
+        return cleanDB();
     });
-});
+});