Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate Settings editor open and search steps #196866

Merged
merged 1 commit into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions test/automation/src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ export class SettingsEditor {
}

async searchSettingsUI(query: string): Promise<void> {
await this.openUserSettingsUI();

await this.code.waitAndClick(SEARCH_BOX);
if (process.platform === 'darwin') {
await this.code.dispatchKeybinding('cmd+a');
Expand Down
7 changes: 5 additions & 2 deletions test/smoke/src/areas/preferences/preferences.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function setup(logger: Logger) {
it('shows a modified indicator on a modified setting', async function () {
const app = this.app as Application;

await app.workbench.settingsEditor.openUserSettingsUI();
await app.workbench.settingsEditor.searchSettingsUI('@id:editor.tabSize');
await app.code.waitForSetValue('.settings-editor .setting-item-contents .setting-item-control input', '6');
await app.code.waitForElement('.settings-editor .setting-item-contents .setting-item-modified-indicator');
Expand All @@ -56,6 +57,7 @@ export function setup(logger: Logger) {
await app.code.waitForElements('.line-numbers', false, elements => !!elements.length);

// Turn off line numbers
await app.workbench.settingsEditor.openUserSettingsUI();
await app.workbench.settingsEditor.searchSettingsUI('editor.lineNumbers');
await app.code.waitAndClick('.settings-editor .monaco-list-rows .setting-item-control select', 2, 2);
await app.code.waitAndClick('.context-view .option-text', 2, 2);
Expand All @@ -64,10 +66,11 @@ export function setup(logger: Logger) {
await app.code.waitForElements('.line-numbers', false, elements => !elements || elements.length === 0);
});

// Skipping test due to it being flaky.
it.skip('hides the toc when searching depending on the search behavior', async function () {
it('hides the toc when searching depending on the search behavior', async function () {
const app = this.app as Application;

await app.workbench.settingsEditor.openUserSettingsUI();

// Hide ToC when searching
await app.workbench.settingsEditor.searchSettingsUI('workbench.settings.settingsSearchTocBehavior');
await app.code.waitAndClick('.settings-editor .monaco-list-rows .setting-item-control select', 2, 2);
Expand Down