bugfix(@nestjs/testing) await scan() operation

nestjs · Jul 4, 2018 · a9204cb · a9204cb
1 parent bd3b102
commit a9204cb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/integration/hello-world/e2e/fastify-adapter.spec.ts b/integration/hello-world/e2e/fastify-adapter.spec.ts
@@ -1,18 +1,12 @@
-import { expect } from 'chai';
-import * as fastify from 'fastify';
-import * as request from 'supertest';
-import * as express from 'express';
-import { Test } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
-import { ApplicationModule } from './../src/app.module';
-import { FastifyAdapter } from '@nestjs/core/adapters/fastify-adapter';
-import { ExpressAdapter } from '@nestjs/core/adapters/express-adapter';
-import { HelloService } from '../src/hello/hello.service';
 import { INestFastifyApplication } from '@nestjs/common/interfaces/nest-fastify-application.interface';
+import { FastifyAdapter } from '@nestjs/core/adapters/fastify-adapter';
+import { Test } from '@nestjs/testing';
+import { expect } from 'chai';
+import { ApplicationModule } from './../src/app.module';
 
 describe('Hello world (fastify adapter)', () => {
-  let server;
-  let app: INestApplication & INestFastifyApplication
+  let app: INestApplication & INestFastifyApplication;
 
   beforeEach(async () => {
     const module = await Test.createTestingModule({

diff --git a/packages/common/http/http.service.ts b/packages/common/http/http.service.ts
@@ -52,6 +52,6 @@ export class HttpService {
   }
 
   get axiosRef() {
-    return axios;
+    return axios as any;
   }
 }
diff --git a/packages/testing/testing-module.builder.ts b/packages/testing/testing-module.builder.ts
@@ -25,7 +25,6 @@ export class TestingModuleBuilder {
       this.applicationConfig,
     );
     this.module = this.createModule(metadata);
-    this.scanner.scan(this.module);
   }
 
   public overridePipe(typeOrToken): OverrideBy {
@@ -58,6 +57,7 @@ export class TestingModuleBuilder {
 
   public async compile(): Promise<TestingModule> {
     this.applyLogger();
+    await this.scanner.scan(this.module);
 
     [...this.overloadsMap.entries()].map(([component, options]) => {
       this.container.replace(component, options);

diff --git a/packages/websockets/adapters/io-adapter.ts b/packages/websockets/adapters/io-adapter.ts
@@ -48,8 +48,11 @@ export class IoAdapter implements WebSocketAdapter {
     handlers.forEach(({ message, callback }) =>
       fromEvent(client, message)
         .pipe(
-          mergeMap(data => transform(callback(data))),
-          filter(result => result && result.event),
+          mergeMap(data =>
+            transform(callback(data)).pipe(
+              filter((result: any) => result && result.event),
+            ),
+          ),
         )
         .subscribe(({ event, data }) => client.emit(event, data)),
     );

diff --git a/packages/websockets/adapters/ws-adapter.ts b/packages/websockets/adapters/ws-adapter.ts
@@ -53,8 +53,11 @@ export class WsAdapter implements WebSocketAdapter {
   ) {
     fromEvent(client, 'message')
       .pipe(
-        mergeMap(data => this.bindMessageHandler(data, handlers, transform)),
-        filter(result => result),
+        mergeMap(data =>
+          this.bindMessageHandler(data, handlers, transform).pipe(
+            filter(result => result),
+          ),
+        ),
       )
       .subscribe(response => client.send(JSON.stringify(response)));
   }
@@ -71,8 +74,7 @@ export class WsAdapter implements WebSocketAdapter {
       );
       const { callback } = messageHandler;
       return transform(callback(message.data));
-    }
-    catch {
+    } catch {
       return empty;
     }
   }

diff --git a/packages/websockets/web-sockets-controller.ts b/packages/websockets/web-sockets-controller.ts
@@ -5,7 +5,7 @@ import { NestContainer } from '@nestjs/core/injector/container';
 import { MetadataScanner } from '@nestjs/core/metadata-scanner';
 import 'reflect-metadata';
 import { from as fromPromise, Observable, of, Subject } from 'rxjs';
-import { distinctUntilChanged, mergeMap } from 'rxjs/operators';
+import { distinctUntilChanged, mergeAll } from 'rxjs/operators';
 import { GATEWAY_OPTIONS, PORT_METADATA } from './constants';
 import { WsContextCreator } from './context/ws-context-creator';
 import { InvalidSocketPortException } from './exceptions/invalid-socket-port.exception';
@@ -146,7 +146,7 @@ export class WebSocketsController {
       callback: callback.bind(instance, client),
     }));
     adapter.bindMessageHandlers(client, handlers, data =>
-      fromPromise(this.pickResult(data)).pipe(mergeMap(stream => stream)),
+      fromPromise(this.pickResult(data)).pipe(mergeAll()),
     );
   }