Wait on SAML login to be ready

.github/workflows/e2e-tests-ci.yml

@@ -39,6 +39,8 @@ jobs:
       - run: pnpm install
       - name: Pull/Build Docker Containers Necessary for Running E2E Tests
         run: docker compose --env-file ./config/env.development up -d ${{ env.DOCKER_CONTAINERS }}
+      - name: Wait for Postgres and Login containers to become fully ready
+        run: pnpx -y wait-on -t 60000 tcp:5432 http://localhost:8081/simplesaml
       - name: Apply database migrations
         run: pnpm db:migrate
       - run: pnpm jest:e2e

src/api/feed-discovery/package.json

@@ -29,6 +29,7 @@
   },
   "devDependencies": {
     "@senecacdot/eslint-config-telescope": "1.1.0",
+    "eslint": "7.32.0",
     "nock": "13.2.4",
     "nodemon": "2.0.15",
     "supertest": "6.1.6"

src/api/sso/jest.config.e2e.js

@@ -1,34 +1,14 @@
-// eslint-disable-next-line
-const { waitForPostgres } = require('@jcoreio/wait-for-postgres');
-
 const baseConfig = require('../../../jest.config.base');
 
-module.exports = async () => {
-  try {
-    console.log('Waiting for Supabase postgres container to become ready...');
-    await waitForPostgres({
-      host: 'localhost',
-      user: 'postgres',
-      password: process.env.POSTGRES_PASSWORD,
-      database: 'postgres',
-      timeout: 60 * 1000,
-    });
-  } catch (err) {
-    console.warn('Unable to connect to postgres container');
-    throw err;
-  }
-
-  console.log('Supabase postgres container ready.');
-  return {
-    ...baseConfig,
-    rootDir: '../../..',
-    testMatch: ['<rootDir>/src/api/sso/test/e2e/**/*.test.js'],
-    collectCoverageFrom: ['<rootDir>/src/api/sso/src/**/*.js'],
-    // We use jest-playwright to do browser tests, https://github.com/playwright-community/jest-playwright
-    // See the jest-playwright config in the Telescope root ./jest-playwright.config.js
-    preset: 'jest-playwright-preset',
-    // Try reducing the number of tests that can run at once down to 1
-    maxConcurrency: 1,
-    maxWorkers: 1,
-  };
-};
+module.exports = () => ({
+  ...baseConfig,
+  rootDir: '../../..',
+  testMatch: ['<rootDir>/src/api/sso/test/e2e/**/*.test.js'],
+  collectCoverageFrom: ['<rootDir>/src/api/sso/src/**/*.js'],
+  // We use jest-playwright to do browser tests, https://github.com/playwright-community/jest-playwright
+  // See the jest-playwright config in the Telescope root ./jest-playwright.config.js
+  preset: 'jest-playwright-preset',
+  // Try reducing the number of tests that can run at once down to 1
+  maxConcurrency: 1,
+  maxWorkers: 1,
+});

src/api/sso/package.json

@@ -35,7 +35,6 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@jcoreio/wait-for-postgres": "2.0.0",
     "@senecacdot/eslint-config-telescope": "1.1.0",
     "env-cmd": "10.1.0",
     "eslint": "7.32.0",