提交 aa1aafba 编写于 作者: R Rob Lourens

Unbreak settings-related smoke tests

上级 70c42efe
......@@ -28,7 +28,7 @@ export function setup() {
await app.workbench.problems.hideProblemsView();
});
it.skip('verifies that warning becomes an error once setting changed', async function () {
it('verifies that warning becomes an error once setting changed', async function () {
// settings might take a while to update?
this.timeout(40000);
......
......@@ -7,7 +7,7 @@ import { Application } from '../../application';
import { ActivityBarPosition } from '../activitybar/activityBar';
export function setup() {
describe.skip('Preferences', () => {
describe('Preferences', () => {
it('turns off editor line numbers and verifies the live change', async function () {
const app = this.app as Application;
......
......@@ -8,6 +8,7 @@ import * as path from 'path';
import { Editor } from '../editor/editor';
import { Editors } from '../editor/editors';
import { Code } from '../../vscode/code';
import { QuickOpen } from '../quickopen/quickopen';
export enum ActivityBarPosition {
LEFT = 0,
......@@ -18,7 +19,7 @@ const SEARCH_INPUT = '.settings-search-input input';
export class SettingsEditor {
constructor(private code: Code, private userDataPath: string, private editors: Editors, private editor: Editor) { }
constructor(private code: Code, private userDataPath: string, private editors: Editors, private editor: Editor, private quickopen: QuickOpen) { }
async addUserSetting(setting: string, value: string): Promise<void> {
await this.openSettings();
......@@ -41,10 +42,6 @@ export class SettingsEditor {
}
private async openSettings(): Promise<void> {
if (process.platform === 'darwin') {
await this.code.dispatchKeybinding('cmd+,');
} else {
await this.code.dispatchKeybinding('ctrl+,');
}
await this.quickopen.runCommand('Preferences: Open User Settings');
}
}
\ No newline at end of file
......@@ -55,7 +55,7 @@ export class Workbench {
this.debug = new Debug(code, this.quickopen, this.editors, this.editor);
this.statusbar = new StatusBar(code);
this.problems = new Problems(code);
this.settingsEditor = new SettingsEditor(code, userDataPath, this.editors, this.editor);
this.settingsEditor = new SettingsEditor(code, userDataPath, this.editors, this.editor, this.quickopen);
this.keybindingsEditor = new KeybindingsEditor(code);
this.terminal = new Terminal(code);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册