Test host through DI

Author: devversion

typescript/src/processors/readTypeScriptModules/index.ts

@@ -55,12 +55,6 @@ export class ReadTypeScriptModules implements Processor {
     ignoreExportsMatching: Array<string|RegExp> = ['__esModule'];
     ignoreExportsRegexes: RegExp[] = [];
 
-    /**
-     * Whether multiple leading comments of a TypeScript node should be concatenated or not.
-     * By default, multiple leading comments for a node will be concatenated.
-     */
-    concatLeadingNodeComments = true;
-
     constructor(
       private tsParser: TsParser,
       private host: Host,

typescript/src/services/ts-host/host.spec.ts

@@ -1,20 +1,36 @@
+import { Dgeni, Package } from 'dgeni';
 import { TsParser } from '../TsParser';
 import { Host } from './host';
 
+const mockPackage = require('../../mocks/mockPackage');
 const path = require('canonical-path');
 
 describe('Host', () => {
+  const basePath = path.resolve(__dirname, '../../mocks/tsParser');
+
   let host: Host;
   let parser: TsParser;
-  let basePath: string;
 
-  beforeEach(() => {
-    host = new Host();
-    parser = new TsParser(require('dgeni/lib/mocks/log')(false));
-    basePath = path.resolve(__dirname, '../../mocks/tsParser');
-  });
+  /**
+   * Creates the Host instance through Dgeni dependency injection. Also allows passing a function
+   * that will run in Dgeni's configuration lifecycle and allows modifying the host factory.
+   */
+  function setupTestDgeniInstance(configureFn: (host: Host) => void) {
+    const testPackage = mockPackage() as Package;
+
+    testPackage.config((tsHost: Host) => configureFn(tsHost));
+
+    const dgeni = new Dgeni([testPackage]);
+    const injector = dgeni.configureInjector();
+
+    // Load factories from the Dgeni injector.
+    host = injector.get('tsHost');
+    parser = injector.get('tsParser');
+  }
 
   it("should read content of a declaration", () => {
+    setupTestDgeniInstance(h => h.concatMultipleLeadingComments = true);
+
     const parseInfo = parser.parse(['multipleLeadingComments.ts'], basePath);
     const module = parseInfo.moduleSymbols[0];
     const declaration = module.exportArray[0].valueDeclaration!;
@@ -24,6 +40,8 @@ describe('Host', () => {
   });
 
   it('should be able to disable leading comment concatenation', () => {
+    setupTestDgeniInstance(h => h.concatMultipleLeadingComments = false);
+
     const parseInfo = parser.parse(['multipleLeadingComments.ts'], basePath);
     const module = parseInfo.moduleSymbols[0];
     const declaration = module.exportArray[0].valueDeclaration!;