From 42bd3e884bc49e3ed53a8f4ea2960a55f3f475b9 Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Tue, 23 Nov 2021 15:46:18 -0800
Subject: [PATCH] More clean up of terminal smoke test init

---
 test/smoke/src/areas/terminal/terminal-persistence.test.ts | 5 ++---
 test/smoke/src/areas/terminal/terminal-profiles.test.ts    | 5 ++---
 test/smoke/src/areas/terminal/terminal-tabs.test.ts        | 5 ++---
 test/smoke/src/areas/terminal/terminal.test.ts             | 7 +++++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/smoke/src/areas/terminal/terminal-persistence.test.ts b/test/smoke/src/areas/terminal/terminal-persistence.test.ts
index 754bff8f96c..c57e1d2a05c 100644
--- a/test/smoke/src/areas/terminal/terminal-persistence.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-persistence.test.ts
@@ -8,10 +8,9 @@ import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue }
 
 export function setup(opts: ParsedArgs) {
 	describe('Terminal Persistence', () => {
-		let terminal: Terminal;
-
 		// Acquire automation API
-		before(async function () {
+		let terminal: Terminal;
+		before(function () {
 			const app = this.app as Application;
 			terminal = app.workbench.terminal;
 		});
diff --git a/test/smoke/src/areas/terminal/terminal-profiles.test.ts b/test/smoke/src/areas/terminal/terminal-profiles.test.ts
index 597f03f8c5d..3132b3c835e 100644
--- a/test/smoke/src/areas/terminal/terminal-profiles.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-profiles.test.ts
@@ -11,10 +11,9 @@ const ANY_PROFILE_NAME = '^((?!JavaScript Debug Terminal).)*$';
 
 export function setup(opts: ParsedArgs) {
 	describe('Terminal Profiles', () => {
-		let terminal: Terminal;
-
 		// Acquire automation API
-		before(async function () {
+		let terminal: Terminal;
+		before(function () {
 			const app = this.app as Application;
 			terminal = app.workbench.terminal;
 		});
diff --git a/test/smoke/src/areas/terminal/terminal-tabs.test.ts b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
index 19faa4ae13d..82bb749c2b5 100644
--- a/test/smoke/src/areas/terminal/terminal-tabs.test.ts
+++ b/test/smoke/src/areas/terminal/terminal-tabs.test.ts
@@ -9,10 +9,9 @@ import { Application, Terminal, TerminalCommandId, TerminalCommandIdWithValue }
 
 export function setup(opts: ParsedArgs) {
 	describe('Terminal Tabs', () => {
-		let terminal: Terminal;
-
 		// Acquire automation API
-		before(async function () {
+		let terminal: Terminal;
+		before(function () {
 			const app = this.app as Application;
 			terminal = app.workbench.terminal;
 		});
diff --git a/test/smoke/src/areas/terminal/terminal.test.ts b/test/smoke/src/areas/terminal/terminal.test.ts
index a8010c28df2..7813375a72b 100644
--- a/test/smoke/src/areas/terminal/terminal.test.ts
+++ b/test/smoke/src/areas/terminal/terminal.test.ts
@@ -12,8 +12,8 @@ import { setup as setupTerminalProfileTests } from './terminal-profiles.test';
 import { setup as setupTerminalTabsTests } from './terminal-tabs.test';
 
 export function setup(opts: minimist.ParsedArgs) {
-	describe.only('Terminal', () => {
-		// TODO: Enable terminal tests for non-web when it moved to playwright
+	describe('Terminal', () => {
+		// TODO: Enable terminal tests for non-web when the desktop driver is moved to playwright
 		if (!opts.web) {
 			return;
 		}
@@ -29,6 +29,9 @@ export function setup(opts: minimist.ParsedArgs) {
 
 			// Always show tabs to make getting terminal groups easier
 			await app.workbench.settingsEditor.addUserSetting('terminal.integrated.tabs.hideCondition', '"never"');
+
+			// Close the settings editor
+			await app.workbench.quickaccess.runCommand('workbench.action.closeAllEditors');
 		});
 
 		afterEach(async () => {