From a5b58dc5b859288acb85511dc0f390470b78bd9f Mon Sep 17 00:00:00 2001
From: Daniel Imms <tyriar@tyriar.com>
Date: Thu, 12 Sep 2019 21:32:41 -0700
Subject: [PATCH] Link directly to automation from smoke

---
 test/smoke/package.json                               | 1 -
 test/smoke/src/areas/css/css.test.ts                  | 2 +-
 test/smoke/src/areas/debug/debug.test.ts              | 2 +-
 test/smoke/src/areas/editor/editor.test.ts            | 2 +-
 test/smoke/src/areas/explorer/explorer.test.ts        | 2 +-
 test/smoke/src/areas/extensions/extensions.test.ts    | 2 +-
 test/smoke/src/areas/git/git.test.ts                  | 2 +-
 test/smoke/src/areas/multiroot/multiroot.test.ts      | 2 +-
 test/smoke/src/areas/preferences/preferences.test.ts  | 2 +-
 test/smoke/src/areas/search/search.test.ts            | 2 +-
 test/smoke/src/areas/statusbar/statusbar.test.ts      | 2 +-
 test/smoke/src/areas/terminal/terminal.test.ts        | 2 +-
 test/smoke/src/areas/workbench/data-loss.test.ts      | 2 +-
 test/smoke/src/areas/workbench/data-migration.test.ts | 2 +-
 test/smoke/src/areas/workbench/launch.test.ts         | 2 +-
 test/smoke/src/areas/workbench/localization.test.ts   | 2 +-
 test/smoke/src/main.ts                                | 2 +-
 17 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/test/smoke/package.json b/test/smoke/package.json
index 5f50c32c93c..be3067a8727 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -4,7 +4,6 @@
   "main": "./src/main.js",
   "scripts": {
     "postinstall": "npm run compile",
-    "precompile": "yarn add vscode-automation@link:../automation",
     "compile": "yarn --cwd ../automation compile && tsc",
     "watch": "concurrently \"yarn --cwd ../automation watch --preserveWatchOutput\" \"tsc --watch --preserveWatchOutput\"",
     "mocha": "mocha"
diff --git a/test/smoke/src/areas/css/css.test.ts b/test/smoke/src/areas/css/css.test.ts
index 3001f366247..454f6eed9e8 100644
--- 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
index 1dd22771d6e..c3fb76fe6c0 100644
--- 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
index 22828bb109d..469d5a179b1 100644
--- 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
index 9b28e5214dc..acba5b12ea7 100644
--- 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
index 15c5b9bad1b..bf43a5013fd 100644
--- 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
index ab4ba97aafb..300c832694d 100644
--- 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
index e6c04301e23..0a1090a3ff5 100644
--- 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
index e1c1b64ce62..721f46a7de6 100644
--- 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
index dac1331a401..4e34b0049cc 100644
--- 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
index dfbe3c30590..a4ecca8e047 100644
--- 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
index 75657ce9908..034c1f21666 100644
--- 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
index 3ee4ead38ef..a6cc6577675 100644
--- 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
index e296566310f..7e9fb9cc68e 100644
--- 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
index 4903ddece9c..3d1e4c42fd0 100644
--- 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
index a136781b153..5db5fe2b74a 100644
--- 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
index e51aa4b9454..1f05158f281 100644
--- 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';
-- 
GitLab