Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions

View File

@@ -22,7 +22,11 @@ async function createWorkspaceFile(workspacePath: string): Promise<string> {
{ path: toUri(path.join(workspacePath, 'public')) },
{ path: toUri(path.join(workspacePath, 'routes')) },
{ path: toUri(path.join(workspacePath, 'views')) }
]
],
settings: {
'workbench.startupEditor': 'none',
'workbench.enableExperiments': false
}
};
fs.writeFileSync(workspaceFilePath, JSON.stringify(workspace, null, '\t'));

View File

@@ -63,7 +63,7 @@ export function setup() {
await app.workbench.notebook.waitForActiveCellEditorContents('code()');
});
it('cell action execution', async function () {
it.skip('cell action execution', async function () {
const app = this.app as Application;
await app.workbench.notebook.openNotebook();
await app.workbench.notebook.insertNotebookCell('code');

View File

@@ -15,6 +15,15 @@ export function setup() {
cp.execSync('git reset --hard HEAD --quiet', { cwd: app.workspacePathOrFolder });
});
// https://github.com/microsoft/vscode/issues/124146
it.skip /* https://github.com/microsoft/vscode/issues/124335 */('has a tooltp with a keybinding', async function () {
const app = this.app as Application;
const tooltip: string = await app.workbench.search.getSearchTooltip();
if (!/Search \(.+\)/.test(tooltip)) {
throw Error(`Expected search tooltip to contain keybinding but got ${tooltip}`);
}
});
it('searches for body & checks for correct result number', async function () {
const app = this.app as Application;
await app.workbench.search.openSearchViewlet();

View File

@@ -10,7 +10,8 @@ export function setup() {
before(async function () {
const app = this.app as Application;
if (app.quality === Quality.Dev) {
// Don't run the localization tests in dev or remote.
if (app.quality === Quality.Dev || app.remote) {
return;
}
@@ -23,7 +24,7 @@ export function setup() {
it(`starts with 'DE' locale and verifies title and viewlets text is in German`, async function () {
const app = this.app as Application;
if (app.quality === Quality.Dev) {
if (app.quality === Quality.Dev || app.remote) {
this.skip();
return;
}