Merge pull request #18 from epcgrs/fix/npm-test

orchestrators and testes more robusts

Author: epcgrs

jest.config.js

@@ -11,6 +11,7 @@ const createJestConfig = nextJest({
 const jestConfig = createJestConfig({
   moduleDirectories: ['node_modules', '<rootDir>'],
   setupFiles: ['dotenv/config'],
+  testTimeout: 30000
 });
 
 module.exports = jestConfig;

package-lock.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "test": "jest --runInBand",
+    "test": "npm run services:up && concurrently -n \"next,jest\" --hide next -k -s command-jest \"next dev\" \"jest --runInBand\"",
     "test:watch": "jest --watchAll --runInBand",
     "dev": "npm run services:up && npm run wait-for-postgres && npm run migration:up && next dev",
     "services:up": "docker compose -f infra/compose.yaml up -d",
@@ -20,6 +20,7 @@
   "license": "MIT",
   "description": "",
   "dependencies": {
+    "async-retry": "^1.3.3",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",
     "next": "^13.1.6",
@@ -29,6 +30,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
+    "concurrently": "^9.2.1",
     "jest": "^29.6.2",
     "prettier": "^3.5.3"
   }

package.json

@@ -3,14 +3,14 @@ import database from 'infra/database.js';
 export default async function migrations(request, response) {
 
   if (request.method !== 'GET' && request.method !== 'POST') {
-    response.setHeader("Content-Type", "application/json");
     response.setHeader("Allow", ["GET", "POST"]);
-    response.status(405).end(`Method ${request.method} Not Allowed`);
+    return response.status(405).end(`Method ${request.method} Not Allowed`);
   }
 
   if (request.method === 'GET') {
     return await migrationGet(request, response);
-  } else if (request.method === 'POST') {
+  }
+  if (request.method === 'POST') {
     return await migrationPost(request, response);
   }
 

pages/api/v1/migrations/index.js

@@ -1,12 +1,16 @@
 import database from "infra/database";
+import orchestrator from "tests/orchestrator";
+
+beforeAll(async () => {
+  await orchestrator.waitForAllServices();
+  await cleanDatabase();
+});
 
 async function cleanDatabase() {
   await database.query("drop schema public cascade;");
   await database.query("create schema public;");
 }
 
-beforeAll(cleanDatabase);
-
 test("GET to /api/v1/migrations should return 200", async () => {
 
   const response = await fetch("http://localhost:3000/api/v1/migrations");

…ntegration/api/v1/migrations/get.test.js …ntegration/api/v1/migrations/get.test.jstests/unit/integration/api/v1/migrations/get.test.js renamed to tests/integration/api/v1/migrations/get.test.js tests/unit/integration/api/v1/migrations/get.test.js renamed to tests/integration/api/v1/migrations/get.test.js

@@ -1,12 +1,16 @@
 import database from "infra/database";
+import orchestrator from "tests/orchestrator";
+
+beforeAll(async () => {
+  await orchestrator.waitForAllServices();
+  await cleanDatabase();
+});
 
 async function cleanDatabase() {
   await database.query("drop schema public cascade;");
   await database.query("create schema public;");
 }
 
-beforeAll(cleanDatabase);
-
 test("POST to /api/v1/migrations should return 200", async () => {
 
   const response1 = await fetch("http://localhost:3000/api/v1/migrations", {

…tegration/api/v1/migrations/post.test.js …tegration/api/v1/migrations/post.test.jstests/unit/integration/api/v1/migrations/post.test.js renamed to tests/integration/api/v1/migrations/post.test.js tests/unit/integration/api/v1/migrations/post.test.js renamed to tests/integration/api/v1/migrations/post.test.js

@@ -1,3 +1,9 @@
+import orchestrator from "tests/orchestrator";
+
+beforeAll(async () => {
+  await orchestrator.waitForAllServices();
+});
+
 test("GET to /api/v1/status should return 200", async () => {
   const response = await fetch("http://localhost:3000/api/v1/status");
   expect(response.status).toBe(200);

…it/integration/api/v1/status/get.test.js …ts/integration/api/v1/status/get.test.jstests/unit/integration/api/v1/status/get.test.js renamed to tests/integration/api/v1/status/get.test.js tests/unit/integration/api/v1/status/get.test.js renamed to tests/integration/api/v1/status/get.test.js

@@ -0,0 +1,26 @@
+import retry from "async-retry";
+
+async function waitForAllServices() {
+  await waitForWebServer();
+
+  async function waitForWebServer() {
+    await retry(fetchStatusPage, {
+      retries: 100,
+      maxTimeout: 5000,
+    });
+
+    async function fetchStatusPage() {
+      const response = await fetch("http://localhost:3000/api/v1/status");
+      
+      if (!response.ok) {
+        throw new Error("Service is not ready");
+      }
+
+      return false;
+    }
+  }
+}
+
+export default {
+  waitForAllServices
+};