development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #137722

Browse source 
fix #137808
This commit is contained in:
Megan Rogge 2021-11-30 11:54:28 -08:00
parent e89889fe54
commit 005947e3b8
No known key found for this signature in database
GPG key ID: 69182D7934F25879
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/automation/src/terminal.ts
View file

@ -15,7 +15,6 @@ export enum Selector {
PlusButton = '.codicon-plus', PlusButton = '.codicon-plus',
EditorGroups = '.editor .split-view-view', EditorGroups = '.editor .split-view-view',
EditorTab = '.terminal-tab', EditorTab = '.terminal-tab',
EditorTabIcon = '.terminal-tab.codicon-',
SingleTab = '.single-terminal-tab', SingleTab = '.single-terminal-tab',
Tabs = '.tabs-list .monaco-list-row', Tabs = '.tabs-list .monaco-list-row',
SplitButton = '.editor .codicon-split-horizontal' SplitButton = '.editor .codicon-split-horizontal'
@ -149,10 +148,11 @@ export class Terminal {
await this.code.waitForElement(`${selector}`, singleTab => !!singleTab && !!singleTab?.textContent.match(nameRegex)); await this.code.waitForElement(`${selector}`, singleTab => !!singleTab && !!singleTab?.textContent.match(nameRegex));
} }
if (color) { if (color) {
await this.code.waitForElement(`${selector}.terminal-icon-terminal_ansi${color}`); await this.code.waitForElement(`${selector}`, singleTab => !!singleTab && !!singleTab.className.includes(`terminal-icon-terminal_ansi${color}`));
} }
if (icon) { if (icon) {
await this.code.waitForElement(selector === Selector.EditorTab ? `${Selector.EditorTabIcon}${icon}` : `${selector} .codicon-${icon}`); selector = selector === Selector.EditorTab ? selector : `${selector} .codicon`;
await this.code.waitForElement(`${selector}`, singleTab => !!singleTab && !!singleTab.className.includes(icon));
} }
} }
} }

6
test/smoke/src/areas/terminal/terminal-editors.test.ts
View file

@ -16,16 +16,14 @@ export function setup(opts: ParsedArgs) {
terminal = app.workbench.terminal; terminal = app.workbench.terminal;
}); });
// TODO: This was flaky in CI it('should update color of the tab', async () => {
it.skip('should update color of the tab', async () => {
await terminal.runCommand(TerminalCommandId.CreateNewEditor); await terminal.runCommand(TerminalCommandId.CreateNewEditor);
const color = 'Cyan'; const color = 'Cyan';
await terminal.runCommandWithValue(TerminalCommandIdWithValue.ChangeColor, color); await terminal.runCommandWithValue(TerminalCommandIdWithValue.ChangeColor, color);
await terminal.assertSingleTab({ color }, true); await terminal.assertSingleTab({ color }, true);
}); });
// TODO: Flaky https://github.com/microsoft/vscode/issues/137808 it('should update icon of the tab', async () => {
it.skip('should update icon of the tab', async () => {
await terminal.runCommand(TerminalCommandId.CreateNewEditor); await terminal.runCommand(TerminalCommandId.CreateNewEditor);
const icon = 'symbol-method'; const icon = 'symbol-method';
await terminal.runCommandWithValue(TerminalCommandIdWithValue.ChangeIcon, icon); await terminal.runCommandWithValue(TerminalCommandIdWithValue.ChangeIcon, icon);