wip deduplicate test logic

kepelrs · kepelrs · commit 8b6a3129c53f · 2025-04-05T14:28:17.000+03:00
diff --git a/test/test/controllers-without-policy.e2e-spec.ts b/test/test/controllers-without-policy.e2e-spec.ts
@@ -1,10 +1,9 @@
 import { NestExpressApplication } from '@nestjs/platform-express';
-import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { needleStrings, NUMBER_OF_TEST_USER_SEEDS, seed, TestSeed } from '../prisma/seed';
-import { AppModule } from '../src/app.module';
 import { PrismaService } from '../src/prisma.service';
 import { UsersService } from '../src/users/users.service';
+import { createTestingApp } from './helpers';
 
 // TODO: Rename file and split into outlined test groups
 describe('CRUD controllers (without policy) e2e', () => {
@@ -16,12 +15,7 @@ describe('CRUD controllers (without policy) e2e', () => {
     let countries;
 
     beforeAll(async () => {
-        const moduleFixture: TestingModule = await Test.createTestingModule({
-            imports: [AppModule],
-        }).compile();
-
-        app = moduleFixture.createNestApplication();
-        app.set('query parser', 'extended');
+        app = await createTestingApp({ strict: false });
         await app.init();
         prismaService = app.get(PrismaService);
     });
diff --git a/test/test/helpers.ts b/test/test/helpers.ts
@@ -1,3 +1,7 @@
+import { NestExpressApplication } from '@nestjs/platform-express';
+import { Test, TestingModule } from '@nestjs/testing';
+import { AppModule, StrictModeAppModule } from '../src/app.module';
+
 /**
  * Useful when same test must be run across different apps
  */
@@ -9,3 +13,14 @@ export async function multiAppTest(apps: any[], testFn: (app: any) => Promise<an
     }
     return results;
 }
+
+export async function createTestingApp(opts: { strict: boolean }) {
+    const appModule = opts.strict ? StrictModeAppModule : AppModule;
+    const moduleFixture: TestingModule = await Test.createTestingModule({
+        imports: [appModule],
+    }).compile();
+
+    const app = moduleFixture.createNestApplication<NestExpressApplication>();
+    app.set('query parser', 'extended');
+    return app;
+}
diff --git a/test/test/misuse-resistance.e2e-spec.ts b/test/test/misuse-resistance.e2e-spec.ts
@@ -2,8 +2,8 @@ import { NestExpressApplication } from '@nestjs/platform-express';
 import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { needleStrings, seed, TestSeed } from '../prisma/seed';
-import { StrictModeAppModule } from '../src/app.module';
 import { CommentsModule, InvalidCommentsModule } from '../src/comments/comments.module';
+import { createTestingApp } from './helpers';
 
 /**
  * This test outlines the added sane defaults to help developers with the more common careless mistakes
@@ -15,12 +15,7 @@ describe('Misuse resistance', () => {
     const [needleString0] = needleStrings;
 
     beforeAll(async () => {
-        const moduleFixture: TestingModule = await Test.createTestingModule({
-            imports: [StrictModeAppModule],
-        }).compile();
-
-        app = moduleFixture.createNestApplication();
-        app.set('query parser', 'extended');
+        app = await createTestingApp({ strict: true });
         await app.init();
     });
 
diff --git a/test/test/multiple-policies.e2e-spec.ts b/test/test/multiple-policies.e2e-spec.ts
@@ -1,9 +1,7 @@
 import { NestExpressApplication } from '@nestjs/platform-express';
-import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { needleStrings, seed, TestSeed } from '../prisma/seed';
-import { AppModule, StrictModeAppModule } from '../src/app.module';
-import { multiAppTest } from './helpers';
+import { createTestingApp, multiAppTest } from './helpers';
 
 describe('Multiple policies e2e', () => {
     let nonStrictApp: NestExpressApplication;
@@ -12,17 +10,8 @@ describe('Multiple policies e2e', () => {
     const [needleString0] = needleStrings;
 
     beforeAll(async () => {
-        const moduleFixture: TestingModule = await Test.createTestingModule({
-            imports: [AppModule],
-        }).compile();
-        const strictModuleFixture: TestingModule = await Test.createTestingModule({
-            imports: [StrictModeAppModule],
-        }).compile();
-
-        nonStrictApp = moduleFixture.createNestApplication<NestExpressApplication>();
-        nonStrictApp.set('query parser', 'extended');
-        strictApp = strictModuleFixture.createNestApplication<NestExpressApplication>();
-        strictApp.set('query parser', 'extended');
+        nonStrictApp = await createTestingApp({ strict: false });
+        strictApp = await createTestingApp({ strict: true });
 
         await nonStrictApp.init();
         await strictApp.init();
diff --git a/test/test/must-match-auth-attribute-policy.e2e-spec.ts b/test/test/must-match-auth-attribute-policy.e2e-spec.ts
@@ -1,10 +1,8 @@
 import { NestExpressApplication } from '@nestjs/platform-express';
-import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { needleStrings, seed, TestSeed } from '../prisma/seed';
-import { AppModule, StrictModeAppModule } from '../src/app.module';
 import { RoleID } from '../src/authentication.middleware';
-import { multiAppTest } from './helpers';
+import { createTestingApp, multiAppTest } from './helpers';
 
 describe('MustMatchAuthAttributePolicy e2e', () => {
     let nonStrictApp: NestExpressApplication;
@@ -13,17 +11,8 @@ describe('MustMatchAuthAttributePolicy e2e', () => {
     const [needleString0] = needleStrings;
 
     beforeAll(async () => {
-        const moduleFixture: TestingModule = await Test.createTestingModule({
-            imports: [AppModule],
-        }).compile();
-        const strictModuleFixture: TestingModule = await Test.createTestingModule({
-            imports: [StrictModeAppModule],
-        }).compile();
-
-        nonStrictApp = moduleFixture.createNestApplication();
-        nonStrictApp.set('query parser', 'extended');
-        strictApp = strictModuleFixture.createNestApplication();
-        strictApp.set('query parser', 'extended');
+        nonStrictApp = await createTestingApp({ strict: false });
+        strictApp = await createTestingApp({ strict: true });
         await nonStrictApp.init();
         await strictApp.init();
     });
diff --git a/test/test/must-match-value-policy.e2e-spec.ts b/test/test/must-match-value-policy.e2e-spec.ts
@@ -1,10 +1,8 @@
 import { NestExpressApplication } from '@nestjs/platform-express';
-import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { needleStrings, seed, TestSeed } from '../prisma/seed';
-import { AppModule, StrictModeAppModule } from '../src/app.module';
 import { RoleID } from '../src/authentication.middleware';
-import { multiAppTest } from './helpers';
+import { createTestingApp, multiAppTest } from './helpers';
 
 describe('MustMatchValue e2e', () => {
     let nonStrictApp: NestExpressApplication;
@@ -15,17 +13,8 @@ describe('MustMatchValue e2e', () => {
     const [needleString0] = needleStrings;
 
     beforeAll(async () => {
-        const moduleFixture: TestingModule = await Test.createTestingModule({
-            imports: [AppModule],
-        }).compile();
-        const strictModuleFixture: TestingModule = await Test.createTestingModule({
-            imports: [StrictModeAppModule],
-        }).compile();
-
-        nonStrictApp = moduleFixture.createNestApplication();
-        nonStrictApp.set('query parser', 'extended');
-        strictApp = strictModuleFixture.createNestApplication();
-        strictApp.set('query parser', 'extended');
+        nonStrictApp = await createTestingApp({ strict: false });
+        strictApp = await createTestingApp({ strict: true });
         await nonStrictApp.init();
         await strictApp.init();
     });
diff --git a/test/test/rbac.e2e-spec.ts b/test/test/rbac.e2e-spec.ts
@@ -1,29 +1,17 @@
 import { NestExpressApplication } from '@nestjs/platform-express';
-import { Test, TestingModule } from '@nestjs/testing';
 import * as request from 'supertest';
 import { needleStrings, seed } from '../prisma/seed';
-import { AppModule, StrictModeAppModule } from '../src/app.module';
 import { RoleID } from '../src/authentication.middleware';
-import { multiAppTest } from './helpers';
+import { createTestingApp, multiAppTest } from './helpers';
 
 describe('AccessPolicy RBAC e2e', () => {
     let nonStrictApp: NestExpressApplication;
     let strictApp: NestExpressApplication;
     const [needleString0] = needleStrings;
 
     beforeAll(async () => {
-        const moduleFixture: TestingModule = await Test.createTestingModule({
-            imports: [AppModule],
-        }).compile();
-        const strictModuleFixture: TestingModule = await Test.createTestingModule({
-            imports: [StrictModeAppModule],
-        }).compile();
-
-        // TODO: deduplicate this logic across all tests
-        nonStrictApp = moduleFixture.createNestApplication();
-        nonStrictApp.set('query parser', 'extended');
-        strictApp = strictModuleFixture.createNestApplication();
-        strictApp.set('query parser', 'extended');
+        nonStrictApp = await createTestingApp({ strict: false });
+        strictApp = await createTestingApp({ strict: true });
         await nonStrictApp.init();
         await strictApp.init();
     });
