Move getPluginDir into Env

kimjoar · Aug 30, 2017 · 1a8441c · 1a8441c
1 parent 145ffb0
commit 1a8441c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/platform/config/Env.ts b/platform/config/Env.ts
@@ -38,6 +38,10 @@ export class Env {
       : this.argv.config;
   }
 
+  getPluginDir(pluginName: string) {
+    return resolve(this.pluginsDir, pluginName, 'target', 'dist')
+  }
+
   private getDefaultConfigFile() {
     return resolve(this.configDir, 'kibana.yml');
   }

diff --git a/platform/server/index.ts b/platform/server/index.ts
@@ -39,7 +39,7 @@ export class Server {
     };
 
     this.plugins = new PluginsService(
-      configService.env.pluginsDir,
+      configService.env,
       new PluginSystem(core, logger),
       configService,
       logger

diff --git a/platform/server/plugins/PluginsService.ts b/platform/server/plugins/PluginsService.ts
@@ -5,15 +5,15 @@ import { Plugin } from './Plugin';
 import { PluginSystem } from './PluginSystem';
 import { Logger, LoggerFactory } from '../../logging';
 import { CoreService } from '../../types';
-import { ConfigService } from '../../config';
+import { ConfigService, Env } from '../../config';
 
 const readDirAsObservable = Observable.bindNodeCallback(readdir);
 
 export class PluginsService implements CoreService {
   private readonly log: Logger;
 
   constructor(
-    private readonly pluginsDir: string,
+    private readonly env: Env,
     private readonly pluginSystem: PluginSystem,
     private readonly configService: ConfigService,
     private readonly logger: LoggerFactory
@@ -54,10 +54,10 @@ export class PluginsService implements CoreService {
    * of plugins.
    */
   private readPlugins() {
-    return readDirAsObservable(this.pluginsDir)
+    return readDirAsObservable(this.env.pluginsDir)
       .mergeMap(dirs => dirs)
       .map(name => {
-        const pluginPath = `${this.pluginsDir}/${name}/target/dist/`;
+        const pluginPath = this.env.getPluginDir(name);
         const json = require(pluginPath);
 
         if (!('plugin' in json)) {

diff --git a/platform/server/plugins/__tests__/PluginsService.test.ts b/platform/server/plugins/__tests__/PluginsService.test.ts
@@ -12,12 +12,11 @@ import { resolve } from 'path';
 import { PluginsService } from '../PluginsService';
 import { logger } from '../../../logging/__mocks__';
 
-const examplesPluginsDir = resolve(__dirname, './examplePlugins');
-
 let mockConfigService: any = jest.genMockFromModule(
   '../../../config/ConfigService'
 );
 let mockPluginSystem: any = jest.genMockFromModule('../PluginSystem');
+let env: any = jest.genMockFromModule('../../../config/Env');
 
 beforeEach(() => {
   mockPluginSystem = {
@@ -27,11 +26,13 @@ beforeEach(() => {
   };
 
   mockConfigService.isEnabledAtPath = jest.fn(() => Promise.resolve(true));
+
+  env.getPluginDir = jest.fn(name => resolve(__dirname, 'examplePlugins', name));
 });
 
 test('starts plugins', async () => {
   const pluginsService = new PluginsService(
-    examplesPluginsDir,
+    env,
     mockPluginSystem,
     mockConfigService,
     logger
@@ -53,7 +54,7 @@ test('starts plugins', async () => {
 
 test('stops plugins', async () => {
   const pluginsService = new PluginsService(
-    examplesPluginsDir,
+    env,
     mockPluginSystem,
     mockConfigService,
     logger
@@ -74,7 +75,7 @@ test('does not start plugin if disabled', async () => {
   });
 
   const pluginsService = new PluginsService(
-    examplesPluginsDir,
+    env,
     mockPluginSystem,
     mockConfigService,
     logger

diff --git a/src/jest/tsconfig.json b/src/jest/tsconfig.json
@@ -2,5 +2,8 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "es6"
-  }
+  },
+  "include": [
+    "../../platform/**/*"
+  ]
 }