fix: don't run tests over HTTP, run natively without spawning HTTP server

Author: ivictbor

.gitignore

@@ -3,4 +3,5 @@ plugins/*
 !plugins/README.md
 adapters/*
 !adapters/README.md
-background-jobs-dbs
+background-jobs-dbs
+tests/jest_tests/db/

tests/README

@@ -1,3 +1,2 @@
 To run tests:
-1) Run `task start_app`
-2) Run `task run_tests`
+1) Run `task run_tests`

tests/Taskfile.yaml

@@ -1,7 +1,7 @@
 version: '3'
 tasks:
   start_app:
-    desc: "Start the application server for testing"
+    desc: "Start the application server manually for debugging"
     cmds:
       - "cd application && pnpm migrate:local && pnpm install && pnpm start"
 
@@ -13,4 +13,5 @@ tasks:
   run_tests:
     desc: "Run unit tests"
     cmds:
+      - "cd application && pnpm install"
       - "cd jest_tests && pnpm install && pnpm test"

tests/application/index.ts

@@ -4,7 +4,6 @@ import usersResource from "./resources/adminuser.js";
 import { fileURLToPath } from 'url';
 import path from 'path';
 import { Filters } from 'adminforth';
-import { logger } from 'adminforth';
 import cars_SQLITE_resource from './resources/cars_sl_allow_create.js';
 
 import cars_sl_dont_allow_create from './resources/cars_sl_dont_allow_create.js';
@@ -23,6 +22,15 @@ import carsDescriptionImage from '../../dev-demo/resources/cars_description_imag
 import passkeysResource from '../../dev-demo/resources/passkeys.js';
 
 const ADMIN_BASE_URL = '';
+const appFilePath = fileURLToPath(import.meta.url);
+const appDir = path.dirname(appFilePath);
+const sqliteDbPath = path.join(appDir, '.db.sqlite');
+const customComponentsDir = path.join(appDir, 'custom');
+
+process.env.ADMINFORTH_SECRET ??= '123';
+process.env.NODE_ENV ??= 'test';
+process.env.SQLITE_URL ??= `sqlite://${sqliteDbPath}`;
+process.env.SQLITE_FILE_URL ??= `file:${sqliteDbPath}`;
 
 export const admin = new AdminForth({
   baseUrl: ADMIN_BASE_URL,
@@ -41,6 +49,7 @@ export const admin = new AdminForth({
     },
   },
   customization: {
+    customComponentsDir,
     brandName: "application",
     title: "application",
     favicon: '@@/assets/favicon.png',
@@ -105,7 +114,7 @@ const port = 3333;
 
 admin.express.serve(app);
 
-admin.discoverDatabases().then(async () => {
+const appReady = admin.discoverDatabases().then(async () => {
   if (await admin.resource('adminuser').count() === 0) {
     await admin.resource('adminuser').create({
       email: 'adminforth',
@@ -115,6 +124,35 @@ admin.discoverDatabases().then(async () => {
   }
 });
 
-admin.express.listen(port, () => {});
+async function closeApplication() {
+  await Promise.all(Object.values(admin.connectors).map(async (connector: any) => {
+    if (typeof connector?.close === 'function') {
+      await connector.close();
+    }
+  }));
+
+  if (admin.express.server?.listening) {
+    await new Promise<void>((resolve, reject) => {
+      admin.express.server.close((error) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+}
+
+const isMainModule = process.argv[1] ? path.resolve(process.argv[1]) === appFilePath : false;
+
+if (isMainModule) {
+  appReady.then(() => {
+    admin.express.listen(port, () => {});
+  }).catch((error) => {
+    console.error(error);
+    process.exitCode = 1;
+  });
+}
 
-export { app };
+export { app, appReady, closeApplication };

tests/jest_tests/CRUD_sqlite.test.ts

@@ -1,8 +1,12 @@
 import request from 'supertest';
+import { agent, app, closeApplication } from './testApp';
 
-const agent = request.agent('localhost:3333');
 let authCookie: string;
 
+afterAll(async () => {
+  await closeApplication();
+});
+
 describe('POST /create_record', () => {
   const requestBody: any ={
     "resourceId": "cars_sl",
@@ -31,13 +35,17 @@ describe('POST /create_record', () => {
         password: 'adminforth',
       });
     expect(res.status).toEqual(200);
-    authCookie = res.headers['set-cookie']?.[0];
+    authCookie = res.headers['set-cookie']?.[0]?.split(';')[0];
     expect(authCookie).toContain('adminforth_');
   });
 
-  it('throw an error, that unauthorized access is blocked after login', async () => {
-    const res = await agent
-      .post('/adminapi/v1/create_record');
+  it('blocks create_record for unauthenticated requests', async () => {
+    const res = await request(app)
+      .post('/adminapi/v1/create_record')
+      .send({
+        ...requestBody,
+        resourceId: 'cars_sl',
+      });
     expect(res.status).toEqual(401);
   });
 
@@ -298,7 +306,7 @@ describe('POST /update_record', () => {
         password: 'adminforth',
       });
     expect(res.status).toEqual(200);
-    authCookie = res.headers['set-cookie']?.[0];
+    authCookie = res.headers['set-cookie']?.[0]?.split(';')[0];
     expect(authCookie).toContain('adminforth_');
   });
 
@@ -377,6 +385,11 @@ describe('POST /update_record', () => {
       .post('/adminapi/v1/update_record')
       .send({
         resourceId: 'non_existent_resource',
+        recordId: '21345667',
+        meta: {},
+        record: {
+          model: 'Abobus2',
+        },
       });
     expect(res.status).toEqual(200);
     expect(res.body.error).toBe("Resource 'non_existent_resource' not found");
@@ -676,6 +689,31 @@ describe('POST /get_resource_data', () => {
     });
   });
 
+  it('returns list data for boolean filters without mutating the count path input', async () => {
+    const res = await agent
+      .set('Cookie', authCookie)
+      .post('/adminapi/v1/get_resource_data')
+      .send({
+        resourceId: 'cars_sl',
+        source: 'list',
+        limit: 1,
+        offset: 0,
+        sort: [{ field: 'price', direction: 'desc' }],
+        filters: [
+          { field: 'id', operator: 'eq', value: createdRecordId },
+          { field: 'listed', operator: 'eq', value: true },
+        ],
+      });
+
+    expect(res.status).toEqual(200);
+    expect(res.body.error).toBeUndefined();
+    expect(res.body.total).toBeGreaterThanOrEqual(1);
+    expect(res.body.data[0]).toMatchObject({
+      id: createdRecordId,
+      listed: true,
+    });
+  });
+
   describe('POST /get_resource', () => {
     beforeAll(async () => {
       const res = await agent
@@ -685,7 +723,7 @@ describe('POST /get_resource_data', () => {
           password: 'adminforth',
         });
       expect(res.status).toEqual(200);
-      authCookie = res.headers['set-cookie']?.[0];
+      authCookie = res.headers['set-cookie']?.[0]?.split(';')[0];
       expect(authCookie).toContain('adminforth_');
     });
 
@@ -846,6 +884,7 @@ describe('POST /delete_record', () => {
       .post('/adminapi/v1/delete_record')
       .send({
         resourceId: 'non_existent_resource',
+        primaryKey: 'non_existent_id',
       });
     expect(res.status).toEqual(200);
     expect(res.body.error).toBe("Resource 'non_existent_resource' not found");

tests/jest_tests/jest.config.js

@@ -2,8 +2,9 @@ export default {
   preset: 'ts-jest/presets/default-esm',
   testEnvironment: 'node',
   extensionsToTreatAsEsm: ['.ts'],
+  resolver: './resolver.cjs',
   transform: {
-    '^.+\\.ts$': ['ts-jest', { useESM: true }],
+    '^.+\\.ts$': ['ts-jest', { useESM: true, diagnostics: false }],
   },
 
   transformIgnorePatterns: [

tests/jest_tests/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "type": "module",
   "scripts": {
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
+    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand",
     "test:watch": "jest --watchAll"
   },
   "keywords": [],

tests/jest_tests/resolver.cjs

@@ -0,0 +1,19 @@
+const fs = require('node:fs');
+const path = require('node:path');
+
+module.exports = (request, options) => {
+  const isRelativeJavaScriptImport = (request.startsWith('./') || request.startsWith('../')) && request.endsWith('.js');
+
+  if (isRelativeJavaScriptImport) {
+    const requestedPath = path.resolve(options.basedir, request);
+
+    if (!fs.existsSync(requestedPath)) {
+      const typescriptPath = requestedPath.slice(0, -3) + '.ts';
+      if (fs.existsSync(typescriptPath)) {
+        return options.defaultResolver(typescriptPath, options);
+      }
+    }
+  }
+
+  return options.defaultResolver(request, options);
+};

tests/jest_tests/testApp.ts

@@ -0,0 +1,37 @@
+import { execFile } from 'node:child_process';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { promisify } from 'node:util';
+import request from 'supertest';
+
+const execFileAsync = promisify(execFile);
+const currentDir = path.dirname(fileURLToPath(import.meta.url));
+const applicationDir = path.resolve(currentDir, '../application');
+const sqliteDbPath = path.join(applicationDir, '.db.sqlite');
+
+const testEnv = {
+  ...process.env,
+  ADMINFORTH_SECRET: process.env.ADMINFORTH_SECRET ?? '123',
+  NODE_ENV: process.env.NODE_ENV ?? 'test',
+  SQLITE_URL: process.env.SQLITE_URL ?? `sqlite://${sqliteDbPath}`,
+  SQLITE_FILE_URL: process.env.SQLITE_FILE_URL ?? `file:${sqliteDbPath}`,
+};
+
+process.env.ADMINFORTH_SECRET = testEnv.ADMINFORTH_SECRET;
+process.env.NODE_ENV = testEnv.NODE_ENV;
+process.env.SQLITE_URL = testEnv.SQLITE_URL;
+process.env.SQLITE_FILE_URL = testEnv.SQLITE_FILE_URL;
+
+await fs.rm(sqliteDbPath, { force: true });
+await execFileAsync('pnpm', ['migrate:local'], {
+  cwd: applicationDir,
+  env: testEnv,
+});
+
+const { app, appReady, closeApplication } = await import('../application/index');
+await appReady;
+
+const agent = request.agent(app);
+
+export { agent, app, closeApplication };

tests/jest_tests/tsconfig.json

@@ -5,6 +5,7 @@
     "moduleResolution": "node",
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
+    "isolatedModules": true,
     "types": ["jest", "node"],
     "strict": true
   }