bughz
/
code-server
mirror of https://github.com/coder/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Load only test plugin during tests 

The other plugins in my path were causing the tests to fail.
This commit is contained in:
Asher 2021-01-19 16:44:42 -06:00
parent f6b04c7c29
commit fb37473e72
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/node/plugin.ts
View File

@ -118,7 +118,7 @@ export class PluginAPI {
* loadPlugins loads all plugins based on this.csPlugin, * loadPlugins loads all plugins based on this.csPlugin,
* this.csPluginPath and the built in plugins. * this.csPluginPath and the built in plugins.
*/ */
public async loadPlugins(): Promise<void> { public async loadPlugins(loadBuiltin = true): Promise<void> {
for (const dir of this.csPlugin.split(":")) { for (const dir of this.csPlugin.split(":")) {
if (!dir) { if (!dir) {
continue continue
@ -133,9 +133,10 @@ export class PluginAPI {
await this._loadPlugins(dir) await this._loadPlugins(dir)
} }
// Built-in plugins. if (loadBuiltin) {
await this._loadPlugins(path.join(__dirname, "../../plugins")) await this._loadPlugins(path.join(__dirname, "../../plugins"))
} }
}
/** /**
* _loadPlugins is the counterpart to loadPlugins. * _loadPlugins is the counterpart to loadPlugins.

6
test/plugin.test.ts
View File

@ -15,8 +15,10 @@ describe("plugin", () => {
let s: httpserver.HttpServer let s: httpserver.HttpServer
beforeAll(async () => { beforeAll(async () => {
papi = new PluginAPI(logger, `${path.resolve(__dirname, "test-plugin")}:meow`) // Only include the test plugin to avoid contaminating results with other
await papi.loadPlugins() // plugins that might be on the filesystem.
papi = new PluginAPI(logger, `${path.resolve(__dirname, "test-plugin")}:meow`, "")
await papi.loadPlugins(false)
const app = express.default() const app = express.default()
papi.mount(app) papi.mount(app)