fix: Fix and clean up tests

Author: tomv564

src/plugins.ts

@@ -53,12 +53,11 @@ type RequireResult = { module: {}, error: undefined } | { module: undefined, err
 
 export class PluginLoader {
 
-	public allowLocalPluginLoads: boolean = false;
-	public globalPlugins: string[] = [];
-	public pluginProbeLocations: string[] = [];
-	public require: (path: string) => any = require;
+	private allowLocalPluginLoads: boolean = false;
+	private globalPlugins: string[] = [];
+	private pluginProbeLocations: string[] = [];
 
-	constructor(private rootFilePath: string, private fs: ts.ModuleResolutionHost, initializationOptions?: InitializationOptions, private logger = new NoopLogger()) {
+	constructor(private rootFilePath: string, private fs: ts.ModuleResolutionHost, initializationOptions?: InitializationOptions, private logger = new NoopLogger(), private requireModule: (moduleName: string) => any = require) {
 		if (initializationOptions) {
 			this.allowLocalPluginLoads = initializationOptions.allowLocalPluginLoads || false;
 			this.globalPlugins = initializationOptions.globalPlugins || [];
@@ -143,7 +142,7 @@ export class PluginLoader {
 	private requirePlugin(initialDir: string, moduleName: string): RequireResult {
 		const modulePath = this.resolveJavaScriptModule(moduleName, initialDir, this.fs);
 		try {
-			return { module: this.require(modulePath), error: undefined };
+			return { module: this.requireModule(modulePath), error: undefined };
 		} catch (error) {
 			return { module: undefined, error };
 		}

src/test/plugins.test.ts

@@ -1,22 +1,13 @@
-import * as assert from 'assert';
+import * as path from 'path';
 import * as sinon from 'sinon';
 import * as ts from 'typescript';
 import {InMemoryFileSystem} from '../memfs';
 import {PluginLoader, PluginModule, PluginModuleFactory} from '../plugins';
 import {InitializationOptions} from '../request-type';
+import { path2uri } from '../util';
 
 describe('plugins', () => {
-	describe('constructor', () => {
-		it('should use defaults if no initializationOptions are provided', () => {
-			const memfs = new InMemoryFileSystem('/');
-
-			const loader = new PluginLoader('/', memfs);
-			assert(!loader.allowLocalPluginLoads);
-			assert.equal(loader.globalPlugins.length, 0);
-			assert.equal(loader.pluginProbeLocations.length, 0);
-		});
-	});
-	describe('loader', () => {
+	describe('loadPlugins()', () => {
 		it('should do nothing if no plugins are configured', () => {
 			const memfs = new InMemoryFileSystem('/');
 
@@ -29,16 +20,18 @@ describe('plugins', () => {
 
 		it('should load a global plugin if specified', () => {
 			const memfs = new InMemoryFileSystem('/');
-			memfs.add('file:///Users/tomv/Projects/sourcegraph/node_modules/some-plugin/package.json', '{ "name": "some-plugin", "version": "0.1.1", "main": "plugin.js"}');
-			memfs.add('file:///Users/tomv/Projects/sourcegraph/node_modules/some-plugin/plugin.js', 'module.exports = function (modules) { return 5; };');
+			const peerPackagesPath = path.resolve(__filename, '../../../../');
+			const peerPackagesUri = path2uri(peerPackagesPath);
+			memfs.add(peerPackagesUri + '/node_modules/some-plugin/package.json', '{ "name": "some-plugin", "version": "0.1.1", "main": "plugin.js"}');
+			memfs.add(peerPackagesUri + '/node_modules/some-plugin/plugin.js', '');
 			const initializationOptions: InitializationOptions = {
 				globalPlugins: ['some-plugin'],
 				allowLocalPluginLoads: false,
 				pluginProbeLocations: []
 			};
 			const pluginFactoryFunc = (modules: any) => 5;
-			const loader = new PluginLoader('/', memfs, initializationOptions);
-			loader.require = (path: string) => pluginFactoryFunc;
+			const fakeRequire = (path: string) => pluginFactoryFunc;
+			const loader = new PluginLoader('/', memfs, initializationOptions, undefined, fakeRequire);
 			const compilerOptions: ts.CompilerOptions = {};
 			const applyProxy = sinon.spy();
 			loader.loadPlugins(compilerOptions, applyProxy);
@@ -49,15 +42,15 @@ describe('plugins', () => {
 		it('should load a local plugin if specified', () => {
 			const memfs = new InMemoryFileSystem('/some-project');
 			memfs.add('file:///some-project/node_modules/some-plugin/package.json', '{ "name": "some-plugin", "version": "0.1.1", "main": "plugin.js"}');
-			memfs.add('file:///some-project/node_modules/some-plugin/plugin.js', 'module.exports = function (modules) { return 5; };');
+			memfs.add('file:///some-project/node_modules/some-plugin/plugin.js', '');
 			const initializationOptions: InitializationOptions = {
 				globalPlugins: [],
 				allowLocalPluginLoads: true,
 				pluginProbeLocations: []
 			};
 			const pluginFactoryFunc = (modules: any) => 5;
-			const loader = new PluginLoader('/some-project', memfs, initializationOptions);
-			loader.require = (path: string) => pluginFactoryFunc;
+			const fakeRequire = (path: string) => pluginFactoryFunc;
+			const loader = new PluginLoader('/some-project', memfs, initializationOptions, undefined, fakeRequire);
 			const pluginOption: ts.PluginImport = {
 				name: 'some-plugin'
 			};
@@ -67,7 +60,7 @@ describe('plugins', () => {
 			const applyProxy = sinon.spy();
 			loader.loadPlugins(compilerOptions, applyProxy);
 			sinon.assert.calledOnce(applyProxy);
-			sinon.assert.calledWithExactly(applyProxy, pluginFactoryFunc, sinon.match({ name: 'some-plugin'}));
+			sinon.assert.calledWithExactly(applyProxy, pluginFactoryFunc, sinon.match(pluginOption));
 		});
 
 	});