From 8a4cd00f8f528f9e3e143bcb851c229f96c8e6d2 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Fri, 7 Feb 2020 08:52:37 -0800 Subject: [PATCH] Move terminal tests to common and browser --- .eslintrc.json | 2 +- .../terminalCommandTracker.test.ts | 0 .../{electron-browser => browser}/terminalConfigHelper.test.ts | 0 .../{electron-browser => browser}/terminalLinkHandler.test.ts | 0 .../{electron-browser => common}/terminalColorRegistry.test.ts | 0 test/unit/browser/renderer.html | 3 ++- 6 files changed, 3 insertions(+), 2 deletions(-) rename src/vs/workbench/contrib/terminal/test/{electron-browser => browser}/terminalCommandTracker.test.ts (100%) rename src/vs/workbench/contrib/terminal/test/{electron-browser => browser}/terminalConfigHelper.test.ts (100%) rename src/vs/workbench/contrib/terminal/test/{electron-browser => browser}/terminalLinkHandler.test.ts (100%) rename src/vs/workbench/contrib/terminal/test/{electron-browser => common}/terminalColorRegistry.test.ts (100%) diff --git a/.eslintrc.json b/.eslintrc.json index fada4705598..ba382f622ac 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -627,7 +627,7 @@ }, { "target": "{**/**.test.ts,**/test/**}", - "restrictions": "{**/vs/**,assert,sinon,crypto}" + "restrictions": "{**/vs/**,assert,sinon,crypto,xterm*}" }, { "target": "**/{common,browser,workbench}/**", diff --git a/src/vs/workbench/contrib/terminal/test/electron-browser/terminalCommandTracker.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalCommandTracker.test.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/test/electron-browser/terminalCommandTracker.test.ts rename to src/vs/workbench/contrib/terminal/test/browser/terminalCommandTracker.test.ts diff --git a/src/vs/workbench/contrib/terminal/test/electron-browser/terminalConfigHelper.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalConfigHelper.test.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/test/electron-browser/terminalConfigHelper.test.ts rename to src/vs/workbench/contrib/terminal/test/browser/terminalConfigHelper.test.ts diff --git a/src/vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts b/src/vs/workbench/contrib/terminal/test/browser/terminalLinkHandler.test.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/test/electron-browser/terminalLinkHandler.test.ts rename to src/vs/workbench/contrib/terminal/test/browser/terminalLinkHandler.test.ts diff --git a/src/vs/workbench/contrib/terminal/test/electron-browser/terminalColorRegistry.test.ts b/src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts similarity index 100% rename from src/vs/workbench/contrib/terminal/test/electron-browser/terminalColorRegistry.test.ts rename to src/vs/workbench/contrib/terminal/test/common/terminalColorRegistry.test.ts diff --git a/test/unit/browser/renderer.html b/test/unit/browser/renderer.html index 2f46b408f41..07e2a302b64 100644 --- a/test/unit/browser/renderer.html +++ b/test/unit/browser/renderer.html @@ -47,7 +47,8 @@ paths: { 'vs': new URL('../../../out/vs', baseUrl).href, assert: new URL('../assert.js', baseUrl).href, - sinon: new URL('../../../node_modules/sinon/pkg/sinon-1.17.7.js', baseUrl).href + sinon: new URL('../../../node_modules/sinon/pkg/sinon-1.17.7.js', baseUrl).href, + xterm: new URL('../../../node_modules/xterm/lib/xterm.js', baseUrl).href } });