fix smoketest

microsoft · Sep 4, 2018 · 2bf78e5 · 2bf78e5
1 parent 19dea47
commit 2bf78e5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/vs/platform/driver/electron-browser/driver.ts b/src/vs/platform/driver/electron-browser/driver.ts
@@ -62,7 +62,7 @@ class WindowDriver implements IWindowDriver {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			return TPromise.wrapError(new Error('Element not found'));
+			return TPromise.wrapError(new Error(`Element not found: ${selector}`));
 		}
 
 		const { left, top } = getTopLeftOffset(element as HTMLElement);
@@ -100,7 +100,7 @@ class WindowDriver implements IWindowDriver {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			return TPromise.wrapError(new Error('Element not found'));
+			return TPromise.wrapError(new Error(`Element not found: ${selector}`));
 		}
 
 		const inputElement = element as HTMLInputElement;
@@ -132,7 +132,7 @@ class WindowDriver implements IWindowDriver {
 				el = el.parentElement;
 			}
 
-			return TPromise.wrapError(new Error(`Active element not found. Current active element is '${chain.join(' > ')}'`));
+			return TPromise.wrapError(new Error(`Active element not found. Current active element is '${chain.join(' > ')}'. Looking for ${selector}`));
 		}
 
 		return TPromise.as(true);
@@ -154,7 +154,7 @@ class WindowDriver implements IWindowDriver {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			return TPromise.wrapError(new Error('Editor not found: ' + selector));
+			return TPromise.wrapError(new Error(`Editor not found: ${selector}`));
 		}
 
 		const textarea = element as HTMLTextAreaElement;
@@ -176,13 +176,13 @@ class WindowDriver implements IWindowDriver {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			return TPromise.wrapError(new Error('Terminal not found: ' + selector));
+			return TPromise.wrapError(new Error(`Terminal not found: ${selector}`));
 		}
 
 		const xterm: Terminal = (element as any).xterm;
 
 		if (!xterm) {
-			return TPromise.wrapError(new Error('Xterm not found: ' + selector));
+			return TPromise.wrapError(new Error(`Xterm not found: ${selector}`));
 		}
 
 		const lines: string[] = [];
@@ -198,13 +198,13 @@ class WindowDriver implements IWindowDriver {
 		const element = document.querySelector(selector);
 
 		if (!element) {
-			return TPromise.wrapError(new Error('Element not found'));
+			return TPromise.wrapError(new Error(`Element not found: ${selector}`));
 		}
 
 		const xterm: Terminal = (element as any).xterm;
 
 		if (!xterm) {
-			return TPromise.wrapError(new Error('Xterm not found'));
+			return TPromise.wrapError(new Error(`Xterm not found: ${selector}`));
 		}
 
 		xterm._core.handler(text);

diff --git a/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts b/src/vs/workbench/parts/debug/browser/debugActionsWidget.ts
@@ -244,14 +244,12 @@ export class DebugActionsWidget extends Themable implements IWorkbenchContributi
 
 		this.isVisible = true;
 		dom.show(this.$el);
-		dom.removeClass(this.$el, 'debug-toolbar-hidden');
 		this.setCoordinates();
 	}
 
 	private hide(): void {
 		this.isVisible = false;
 		dom.hide(this.$el);
-		dom.addClass(this.$el, 'debug-toolbar-hidden');
 	}
 
 	public static getActions(allActions: AbstractDebugAction[], toDispose: IDisposable[], debugService: IDebugService, keybindingService: IKeybindingService, instantiationService: IInstantiationService): AbstractDebugAction[] {

diff --git a/test/smoke/src/areas/debug/debug.ts b/test/smoke/src/areas/debug/debug.ts
@@ -23,7 +23,7 @@ const BREAKPOINT_GLYPH = '.debug-breakpoint';
 const PAUSE = `.debug-actions-widget .debug-action.pause`;
 const DEBUG_STATUS_BAR = `.statusbar.debugging`;
 const NOT_DEBUG_STATUS_BAR = `.statusbar:not(debugging)`;
-const TOOLBAR_HIDDEN = `.debug-actions-widget.debug-toolbar-hidden`;
+const TOOLBAR_HIDDEN = `.debug-actions-widget[aria-hidden="true"]`;
 const STACK_FRAME = `${VIEWLET} .monaco-tree-row .stack-frame`;
 const SPECIFIC_STACK_FRAME = filename => `${STACK_FRAME} .file[title*="${filename}"]`;
 const VARIABLE = `${VIEWLET} .debug-variables .monaco-tree-row .expression`;

diff --git a/test/smoke/src/areas/quickopen/quickopen.ts b/test/smoke/src/areas/quickopen/quickopen.ts
@@ -8,8 +8,8 @@ import { Code } from '../../vscode/code';
 
 export class QuickOpen {
 
+	static QUICK_OPEN = 'div.monaco-quick-open-widget';
 	static QUICK_OPEN_HIDDEN = 'div.monaco-quick-open-widget[aria-hidden="true"]';
-	static QUICK_OPEN = 'div.monaco-quick-open-widget[aria-hidden="false"]';
 	static QUICK_OPEN_INPUT = `${QuickOpen.QUICK_OPEN} .quick-open-input input`;
 	static QUICK_OPEN_FOCUSED_ELEMENT = `${QuickOpen.QUICK_OPEN} .quick-open-tree .monaco-tree-row.focused .monaco-highlighted-label`;
 	static QUICK_OPEN_ENTRY_SELECTOR = 'div[aria-label="Quick Picker"] .monaco-tree-rows.show-twisties .monaco-tree-row .quick-open-entry';