Merge branch 'micalevisk-feat/testing-module-options' into 9.0.0

nestjs · Jun 24, 2022 · 55b95c7 · 55b95c7
2 parents 69377a6 + 21a0aee
commit 55b95c7
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 59 deletions.
diff --git a/integration/cors/e2e/express.spec.ts b/integration/cors/e2e/express.spec.ts
@@ -1,10 +1,10 @@
-import { NestFastifyApplication } from '@nestjs/platform-fastify';
+import { NestExpressApplication } from '@nestjs/platform-express';
 import { Test } from '@nestjs/testing';
 import * as request from 'supertest';
 import { AppModule } from '../src/app.module';
 
 describe('Express Cors', () => {
-  let app: NestFastifyApplication;
+  let app: NestExpressApplication;
   const configs = [
     {
       origin: 'example.com',
@@ -30,7 +30,7 @@ describe('Express Cors', () => {
           imports: [AppModule],
         }).compile();
 
-        app = module.createNestApplication<NestFastifyApplication>();
+        app = module.createNestApplication<NestExpressApplication>();
 
         let requestId = 0;
         const configDelegation = function (req, cb) {
@@ -84,7 +84,7 @@ describe('Express Cors', () => {
           cb(null, config);
         };
 
-        app = module.createNestApplication<NestFastifyApplication>(null, {
+        app = module.createNestApplication<NestExpressApplication>({
           cors: configDelegation,
         });
 
@@ -126,7 +126,7 @@ describe('Express Cors', () => {
           imports: [AppModule],
         }).compile();
 
-        app = module.createNestApplication<NestFastifyApplication>();
+        app = module.createNestApplication<NestExpressApplication>();
         app.enableCors(configs[0]);
 
         await app.init();
@@ -153,7 +153,7 @@ describe('Express Cors', () => {
           imports: [AppModule],
         }).compile();
 
-        app = module.createNestApplication<NestFastifyApplication>(null, {
+        app = module.createNestApplication<NestExpressApplication>({
           cors: configs[0],
         });
         await app.init();

diff --git a/integration/cors/e2e/fastify.spec.ts b/integration/cors/e2e/fastify.spec.ts
@@ -1,4 +1,7 @@
-import { NestFastifyApplication } from '@nestjs/platform-fastify';
+import {
+  NestFastifyApplication,
+  FastifyAdapter,
+} from '@nestjs/platform-fastify';
 import { Test } from '@nestjs/testing';
 import * as request from 'supertest';
 import { AppModule } from '../src/app.module';
@@ -30,7 +33,9 @@ describe('Fastify Cors', () => {
           imports: [AppModule],
         }).compile();
 
-        app = module.createNestApplication<NestFastifyApplication>();
+        app = module.createNestApplication<NestFastifyApplication>(
+          new FastifyAdapter(),
+        );
 
         let requestId = 0;
         const configDelegation = function (req, cb) {
@@ -84,9 +89,12 @@ describe('Fastify Cors', () => {
           cb(null, config);
         };
 
-        app = module.createNestApplication<NestFastifyApplication>(null, {
-          cors: configDelegation,
-        });
+        app = module.createNestApplication<NestFastifyApplication>(
+          new FastifyAdapter(),
+          {
+            cors: configDelegation,
+          },
+        );
 
         await app.init();
       });
@@ -127,7 +135,9 @@ describe('Fastify Cors', () => {
           imports: [AppModule],
         }).compile();
 
-        app = module.createNestApplication<NestFastifyApplication>();
+        app = module.createNestApplication<NestFastifyApplication>(
+          new FastifyAdapter(),
+        );
         app.enableCors(configs[0]);
 
         await app.init();
@@ -147,16 +157,19 @@ describe('Fastify Cors', () => {
     after(async () => {
       await app.close();
     });
-    
+
     describe('Application Options', () => {
       before(async () => {
         const module = await Test.createTestingModule({
           imports: [AppModule],
         }).compile();
 
-        app = module.createNestApplication<NestFastifyApplication>(null, {
-          cors: configs[0],
-        });
+        app = module.createNestApplication<NestFastifyApplication>(
+          new FastifyAdapter(),
+          {
+            cors: configs[0],
+          },
+        );
         await app.init();
       });
 

diff --git a/integration/nest-application/raw-body/e2e/express.spec.ts b/integration/nest-application/raw-body/e2e/express.spec.ts
@@ -13,10 +13,9 @@ describe('Raw body (Express Application)', () => {
       imports: [ExpressModule],
     }).compile();
 
-    app = moduleFixture.createNestApplication<NestExpressApplication>(
-      undefined,
-      { rawBody: true },
-    );
+    app = moduleFixture.createNestApplication<NestExpressApplication>({
+      rawBody: true,
+    });
   });
 
   it('should return exact post body', async () => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "@codechecks/client": "0.1.12",
     "@commitlint/cli": "17.0.2",
     "@commitlint/config-angular": "17.0.0",
-    "@fastify/cors": "7.0.0",
+    "@fastify/cors": "^8.0.0",
     "@fastify/formbody": "7.0.1",
     "@fastify/middie": "8.0.0",
     "@fastify/multipart": "6.0.0",

diff --git a/packages/testing/testing-module.ts b/packages/testing/testing-module.ts
@@ -29,20 +29,43 @@ export class TestingModule extends NestApplicationContext {
     super(container, scope, contextModule);
   }
 
+  private isHttpServer(
+    serverOrOptions:
+      | HttpServer
+      | AbstractHttpAdapter
+      | NestApplicationOptions
+      | undefined,
+  ): serverOrOptions is HttpServer | AbstractHttpAdapter {
+    return !!(serverOrOptions && (serverOrOptions as HttpServer).patch);
+  }
+
+  public createNestApplication<T extends INestApplication = INestApplication>(
+    httpAdapter: HttpServer | AbstractHttpAdapter,
+    options?: NestApplicationOptions,
+  ): T;
   public createNestApplication<T extends INestApplication = INestApplication>(
-    httpAdapter?: HttpServer | AbstractHttpAdapter,
+    options?: NestApplicationOptions,
+  ): T;
+  public createNestApplication<T extends INestApplication = INestApplication>(
+    serverOrOptions:
+      | HttpServer
+      | AbstractHttpAdapter
+      | NestApplicationOptions
+      | undefined,
     options?: NestApplicationOptions,
   ): T {
-    httpAdapter = httpAdapter || this.createHttpAdapter();
+    const [httpAdapter, appOptions] = this.isHttpServer(serverOrOptions)
+      ? [serverOrOptions, options]
+      : [this.createHttpAdapter(), serverOrOptions];
 
-    this.applyLogger(options);
+    this.applyLogger(appOptions);
     this.container.setHttpAdapter(httpAdapter);
 
     const instance = new NestApplication(
       this.container,
       httpAdapter,
       this.applicationConfig,
-      options,
+      appOptions,
     );
     return this.createAdapterProxy<T>(instance, httpAdapter);
   }