From 3339ad83f13da2ee8b44b3283df5cefc540aa19e Mon Sep 17 00:00:00 2001
From: Dirk Baeumer <dirkb@microsoft.com>
Date: Mon, 18 Sep 2017 08:37:37 +0200
Subject: [PATCH] Fixed failing task tests

---
 .../test/electron-browser/configuration.test.ts    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts b/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
index c9601239fb1..faa2a392a7c 100644
--- a/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
+++ b/src/vs/workbench/parts/tasks/test/electron-browser/configuration.test.ts
@@ -122,7 +122,7 @@ class CommandConfigurationBuilder {
 			runtime: Tasks.RuntimeType.Process,
 			args: [],
 			options: {
-				cwd: '${workspaceRoot}'
+				cwd: '${workspaceFolder}'
 			},
 			presentation: this.presentationBuilder.result,
 			suppressTaskName: false
@@ -243,7 +243,7 @@ class ProblemMatcherBuilder {
 			applyTo: ApplyToKind.allDocuments,
 			severity: undefined,
 			fileLocation: FileLocationKind.Relative,
-			filePrefix: '${cwd}',
+			filePrefix: '${workspaceFolder}',
 			pattern: undefined
 		};
 	}
@@ -726,7 +726,7 @@ suite('Tasks version 0.1.0', () => {
 			task('tsc', 'tsc').
 			group(Tasks.TaskGroup.Build).
 			command().suppressTaskName(true).
-			options({ cwd: '${workspaceRoot}', env: { key: 'value' } });
+			options({ cwd: '${workspaceFolder}', env: { key: 'value' } });
 		testConfiguration(
 			{
 				version: '0.1.0',
@@ -1589,7 +1589,7 @@ suite('Bugs / regression tests', () => {
 			windows: {
 				command: 'powershell',
 				options: {
-					cwd: '${workspaceRoot}'
+					cwd: '${workspaceFolder}'
 				},
 				tasks: [
 					{
@@ -1612,7 +1612,7 @@ suite('Bugs / regression tests', () => {
 			osx: {
 				command: '/bin/bash',
 				options: {
-					cwd: '${workspaceRoot}'
+					cwd: '${workspaceFolder}'
 				},
 				tasks: [
 					{
@@ -1633,14 +1633,14 @@ suite('Bugs / regression tests', () => {
 			builder.task('composeForDebug', 'powershell').
 				command().suppressTaskName(true).
 				args(['-ExecutionPolicy', 'RemoteSigned', '.\\dockerTask.ps1', '-ComposeForDebug', '-Environment', 'debug']).
-				options({ cwd: '${workspaceRoot}' }).
+				options({ cwd: '${workspaceFolder}' }).
 				presentation().echo(true).reveal(Tasks.RevealKind.Always);
 			testConfiguration(external, builder);
 		} else if (Platform.isMacintosh) {
 			builder.task('composeForDebug', '/bin/bash').
 				command().suppressTaskName(true).
 				args(['-c', './dockerTask.sh composeForDebug debug']).
-				options({ cwd: '${workspaceRoot}' }).
+				options({ cwd: '${workspaceFolder}' }).
 				presentation().reveal(Tasks.RevealKind.Always);
 			testConfiguration(external, builder);
 		}