Merge pull request #80738 from microsoft/tyriar/relink_automation

Relink automation dep before compile
microsoft · Sep 13, 2019 · e27a8a0 · e27a8a0
2 parents 3979479 + a5b58dc
commit e27a8a0
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 189 deletions.
diff --git a/test/smoke/package.json b/test/smoke/package.json
@@ -28,7 +28,6 @@
     "strip-json-comments": "^2.0.1",
     "tmp": "0.0.33",
     "typescript": "2.9.2",
-    "vscode-automation": "link:../automation",
     "watch": "^1.0.2"
   }
 }
diff --git a/test/smoke/src/areas/css/css.test.ts b/test/smoke/src/areas/css/css.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application, ProblemSeverity, Problems } from 'vscode-automation';
+import { Application, ProblemSeverity, Problems } from '../../../../automation';
 
 export function setup() {
 	describe('CSS', () => {

diff --git a/test/smoke/src/areas/debug/debug.test.ts b/test/smoke/src/areas/debug/debug.test.ts
@@ -8,7 +8,7 @@ import * as http from 'http';
 import * as path from 'path';
 import * as fs from 'fs';
 import * as stripJsonComments from 'strip-json-comments';
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 export function setup() {
 	describe('Debug', () => {

diff --git a/test/smoke/src/areas/editor/editor.test.ts b/test/smoke/src/areas/editor/editor.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 export function setup() {
 	describe('Editor', () => {

diff --git a/test/smoke/src/areas/explorer/explorer.test.ts b/test/smoke/src/areas/explorer/explorer.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 export function setup() {
 	describe('Explorer', () => {

diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application, Quality } from 'vscode-automation';
+import { Application, Quality } from '../../../../automation';
 
 export function setup() {
 	describe('Extensions', () => {

diff --git a/test/smoke/src/areas/git/git.test.ts b/test/smoke/src/areas/git/git.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 const DIFF_EDITOR_LINE_INSERT = '.monaco-diff-editor .editor.modified .line-insert';
 const SYNC_STATUSBAR = 'div[id="workbench.parts.statusbar"] .statusbar-item[title$="Synchronize Changes"]';

diff --git a/test/smoke/src/areas/multiroot/multiroot.test.ts b/test/smoke/src/areas/multiroot/multiroot.test.ts
@@ -5,7 +5,7 @@
 
 import * as fs from 'fs';
 import * as path from 'path';
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 function toUri(path: string): string {
 	if (process.platform === 'win32') {

diff --git a/test/smoke/src/areas/preferences/preferences.test.ts b/test/smoke/src/areas/preferences/preferences.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application, ActivityBarPosition } from 'vscode-automation';
+import { Application, ActivityBarPosition } from '../../../../automation';
 
 export function setup() {
 	describe('Preferences', () => {

diff --git a/test/smoke/src/areas/search/search.test.ts b/test/smoke/src/areas/search/search.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 export function setup() {
 	describe('Search', () => {

diff --git a/test/smoke/src/areas/statusbar/statusbar.test.ts b/test/smoke/src/areas/statusbar/statusbar.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application, Quality, StatusBarElement } from 'vscode-automation';
+import { Application, Quality, StatusBarElement } from '../../../../automation';
 
 export function setup() {
 	describe('Statusbar', () => {

diff --git a/test/smoke/src/areas/terminal/terminal.test.ts b/test/smoke/src/areas/terminal/terminal.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 export function setup() {
 	describe('Terminal', () => {

diff --git a/test/smoke/src/areas/workbench/data-loss.test.ts b/test/smoke/src/areas/workbench/data-loss.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application } from 'vscode-automation';
+import { Application } from '../../../../automation';
 
 export function setup() {
 	describe('Dataloss', () => {

diff --git a/test/smoke/src/areas/workbench/data-migration.test.ts b/test/smoke/src/areas/workbench/data-migration.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application, ApplicationOptions } from 'vscode-automation';
+import { Application, ApplicationOptions } from '../../../../automation';
 import { join } from 'path';
 
 export function setup(stableCodePath: string, testDataPath: string) {

diff --git a/test/smoke/src/areas/workbench/launch.test.ts b/test/smoke/src/areas/workbench/launch.test.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as path from 'path';
-import { Application, ApplicationOptions } from 'vscode-automation';
+import { Application, ApplicationOptions } from '../../../../automation';
 
 export function setup() {
 

diff --git a/test/smoke/src/areas/workbench/localization.test.ts b/test/smoke/src/areas/workbench/localization.test.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Application, Quality } from 'vscode-automation';
+import { Application, Quality } from '../../../../automation';
 
 export function setup() {
 	describe('Localization', () => {

diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts
@@ -19,7 +19,7 @@ import {
 	Logger,
 	ConsoleLogger,
 	FileLogger,
-} from 'vscode-automation';
+} from '../../automation';
 
 import { setup as setupDataMigrationTests } from './areas/workbench/data-migration.test';
 import { setup as setupDataLossTests } from './areas/workbench/data-loss.test';