fix test script (disease-sh#986)

* fix test script

* add scraper service

* test mode

* remove smart testing :(

* remove smart testing :(

* remove smart testing :(

* remove smart testing :(

* fix mocharc

* vax scraper

Author: ebwinters

.github/workflows/smart-test.yml

@@ -1,35 +1,35 @@
-name: Smart Unittest
-on: 
-  pull_request:
-    branches:
-      - '*'
-    paths-ignore:
-      - '.github/ISSUE_TEMPLATE/**'
-      - 'docker-publish.yml'
-      - 'README.md'
-      - 'SECURITY.md'
-      - 'TERMS.md'
-      - 'privacy.md'
-      - 'CONTRIBUTING.md'
-jobs:
-  smart-unittest:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: zcong1993/setup-timezone@master
-        with:
-          timezone: America/Denver
-      # get changed files
-      - id: files
-        uses: jitterbit/get-changed-files@v1
-      # create file to hold tests to run
-      - run: touch test_to_run.txt
-      # run node script mapping changed files to tests
-      - run: node associateTests.js ${{ steps.files.outputs.all }} >> test_to_run.txt
-      # supply this file as input to a testing script
-      - run: npm run docker-test
-        env:
-          REDIS_HOST: localhost
-          REDIS_PORT: 6379
-          REDIS_PASSWORD: ""
-          SERVER_PORT: 3000
+# name: Smart Unittest
+# on: 
+#   pull_request:
+#     branches:
+#       - '*'
+#     paths-ignore:
+#       - '.github/ISSUE_TEMPLATE/**'
+#       - 'docker-publish.yml'
+#       - 'README.md'
+#       - 'SECURITY.md'
+#       - 'TERMS.md'
+#       - 'privacy.md'
+#       - 'CONTRIBUTING.md'
+# jobs:
+#   smart-unittest:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v2
+#       - uses: zcong1993/setup-timezone@master
+#         with:
+#           timezone: America/Denver
+#       # get changed files
+#       - id: files
+#         uses: jitterbit/get-changed-files@v1
+#       # create file to hold tests to run
+#       - run: touch test_to_run.txt
+#       # run node script mapping changed files to tests
+#       - run: node associateTests.js ${{ steps.files.outputs.all }} >> test_to_run.txt
+#       # supply this file as input to a testing script
+#       - run: npm run docker-test
+#         env:
+#           REDIS_HOST: localhost
+#           REDIS_PORT: 6379
+#           REDIS_PASSWORD: ""
+#           SERVER_PORT: 3000

.github/workflows/test.yml

@@ -10,6 +10,9 @@ on:
       - 'TERMS.md'
       - 'privacy.md'
       - 'CONTRIBUTING.md'
+  pull_request:
+    branches:
+      - '*'
   schedule:
     - cron: "0 */2 * * *"
 jobs:

docker-compose.test.yml

@@ -2,31 +2,16 @@ version: "3.7"
 
 services:
   redis:
-    image: redis:5.0.8-buster
-    hostname: redis
     container_name: covid-api-redis-test
-    networks:
-      - redis-net
     volumes:
       - redis-data-test:/data
-
   app:
-    image: novelcovid/novelcovid-api:latest
-    command: /bin/sh -c "./runtests.sh"
-    networks:
-      - redis-net
-    depends_on:
-      - redis
-    build: 
-      context: .
-      dockerfile: Dockerfile-Test
+    command: ["npm", "test"]
+    build: .
     environment:
       - TEST_MODE=true
       - DOCKER=true
     container_name: covid-api-app-test
 
-networks:
-  redis-net:
-
 volumes:
   redis-data-test:

docker-compose.yml

@@ -12,8 +12,6 @@ services:
 
   app:
     image: novelcovid/novelcovid-api:latest
-    environment: 
-      - DOCKER=true
     networks:
       - redis-net
     depends_on:
@@ -23,4 +21,4 @@ networks:
   redis-net:
 
 volumes:
-  redis-data:
+  redis-data:

package.json

@@ -27,7 +27,7 @@
     "docker-down": "docker-compose -f docker-compose.yml -f docker-compose.prod.yml down --rmi all",
     "docker-start-dev": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build",
     "docker-down-dev": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml down --rmi all",
-    "docker-test": "docker-compose -f docker-compose.test.yml up --abort-on-container-exit --build"
+    "docker-test": "docker-compose -f docker-compose.yml -f docker-compose.test.yml up --abort-on-container-exit --build"
   },
   "dependencies": {
     "@sentry/node": "5.12.2",

runtests.sh

@@ -1 +1,6 @@
-npm run test-single $(cat test_to_run.txt | while read line; do echo $line; done)
+if [ -s test_to_run.txt ]
+then
+    npm run test
+else
+    npm run test-single $(cat test_to_run.txt | while read line; do echo $line; done)
+fi

tests/mochaSetup.spec.js

@@ -2,8 +2,8 @@ const { scraper: { executeScraper, executeScraperNYTData, excecuteScraperAppleDa
 	redis } = require('../routes/instances');
 const logger = require('../utils/logger');
 
-const testFileArgs = process.argv.splice(5);
-const argValues = new Set(testFileArgs.map(fl => fl.substring(fl.indexOf('_') + 1, fl.indexOf('.'))));
+const [arg] = process.argv[5].split('/').slice(-1);
+const argValue = arg.substring(arg.indexOf('_') + 1, arg.indexOf('.'));
 const mapArgToScraper = {
 	worldometers: executeScraper,
 	jhucsse: executeScraper,
@@ -19,10 +19,8 @@ const mapArgToScraper = {
 before(async () => {
 	await redis.flushall();
 	logger.info('Finished flushing all data from redis.');
-	if (argValues) {
-		await Promise.all(Array.from(argValues).map(async (argValue) => {
-			if (mapArgToScraper[argValue]) await mapArgToScraper[argValue]();
-		}));
+	if (argValue in mapArgToScraper) {
+		await mapArgToScraper[argValue]();
 	} else {
 		await executeScraper();
 		await executeScraperNYTData();