turn integration tests back on (#230)

Co-authored-by: Bob Zhao <[email protected]>

.github/workflows/ci.yaml

@@ -44,7 +44,24 @@ jobs:
         run: npm install
       - name: Run tests
         working-directory: ./query-connector
-        run: npm test
+        run: npm run test:unit
+
+  integration-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{env.NODE_VERSION}}
+      - name: Install dependencies
+        working-directory: ./query-connector
+        run: npm install
+
+      - name: Run tests
+        working-directory: ./query-connector
+        run: npm run test:integration
 
   end-to-end-tests:
     timeout-minutes: 15

query-connector/docker-compose-integration.yaml

@@ -0,0 +1,30 @@
+services:
+  # PostgreSQL DB for custom query and value set storage
+  db:
+    image: "postgres:alpine"
+    ports:
+      - "5432:5432"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=pw
+      - POSTGRES_DB=tefca_db
+
+    volumes:
+      - ./vs_dump.sql:/docker-entrypoint-initdb.d/vs_dump.sql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 2s
+      timeout: 5s
+      retries: 20
+
+  # Flyway migrations and DB version control
+  flyway:
+    image: flyway/flyway:10.16-alpine
+    command: -configFiles=/flyway/conf/flyway.conf -schemas=public -connectRetries=60 migrate
+    platform: linux/amd64
+    volumes:
+      - ./flyway/sql:/flyway/sql
+      - ./flyway/conf/flyway.conf:/flyway/conf/flyway.conf
+    depends_on:
+      db:
+        condition: service_started

query-connector/integration.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e  # Exit immediately if a command exits with a non-zero status
+
+docker compose -f docker-compose-integration.yaml up -d
+
+# wait for flyway to finish running before...
+docker compose -f docker-compose-integration.yaml logs -f flyway | grep -q "Successfully applied"
+
+# running our integration tests
+DATABASE_URL=postgresql://postgres:pw@localhost:5432/tefca_db TEST_TYPE=integration jest --testPathPattern=tests/integration
+JEST_EXIT_CODE=$?
+
+# Teardown containers
+docker compose -f docker-compose-integration.yaml down
+
+# Exit with the Jest exit code
+exit $JEST_EXIT_CODE

query-connector/jest.setup.ts

@@ -1,6 +1,19 @@
+import { getDbClient } from "@/app/backend/dbClient";
 import "@testing-library/jest-dom";
 import { toHaveNoViolations } from "jest-axe";
 import * as matchers from "jest-extended";
+import { Pool } from "pg";
 
 expect.extend(toHaveNoViolations);
 expect.extend(matchers);
+
+if (process.env.TEST_TYPE === "integration") {
+  let dbClient: Pool | null = null;
+  beforeAll(() => {
+    dbClient = getDbClient();
+  });
+
+  afterAll(async () => {
+    await dbClient?.end();
+  });
+}