From 81317867a34bbe742fee73dd8bdf7eea21b10bce Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Tue, 15 Jun 2021 10:57:23 +0200 Subject: [PATCH] web - disable welcome in smoke tests (fix #126221) //cc @JacksonKearl --- .../environment/browser/environmentService.ts | 2 +- test/automation/src/playwrightDriver.ts | 2 +- test/integration/browser/src/index.ts | 2 +- test/smoke/src/areas/editor/editor.test.ts | 16 ------ .../smoke/src/areas/notebook/notebook.test.ts | 54 +++++++++---------- 5 files changed, 30 insertions(+), 46 deletions(-) diff --git a/src/vs/workbench/services/environment/browser/environmentService.ts b/src/vs/workbench/services/environment/browser/environmentService.ts index c9aca19246d..66dfdfcc779 100644 --- a/src/vs/workbench/services/environment/browser/environmentService.ts +++ b/src/vs/workbench/services/environment/browser/environmentService.ts @@ -245,7 +245,7 @@ export class BrowserWorkbenchEnvironmentService implements IWorkbenchEnvironment get logExtensionHostCommunication(): boolean { return this.payload?.get('logExtensionHostCommunication') === 'true'; } get skipReleaseNotes(): boolean { return false; } - get skipWelcome(): boolean { return false; } + get skipWelcome(): boolean { return this.payload?.get('skipWelcome') === 'true'; } @memoize get disableWorkspaceTrust(): boolean { return true; } diff --git a/test/automation/src/playwrightDriver.ts b/test/automation/src/playwrightDriver.ts index eb4702d4b16..d9f75c511fa 100644 --- a/test/automation/src/playwrightDriver.ts +++ b/test/automation/src/playwrightDriver.ts @@ -167,7 +167,7 @@ export function connect(browserType: 'chromium' | 'webkit' | 'firefox' = 'chromi const context = await browser.newContext(); const page = await context.newPage(); await page.setViewportSize({ width, height }); - const payloadParam = `[["enableProposedApi",""]]`; + const payloadParam = `[["enableProposedApi",""],["skipWelcome","true"]]`; await page.goto(`${endpoint}&folder=vscode-remote://localhost:9888${URI.file(workspacePath!).path}&payload=${payloadParam}`); const result = { client: { dispose: () => browser.close() && teardown() }, diff --git a/test/integration/browser/src/index.ts b/test/integration/browser/src/index.ts index fafbccdb1b6..51f31f43bb2 100644 --- a/test/integration/browser/src/index.ts +++ b/test/integration/browser/src/index.ts @@ -46,7 +46,7 @@ async function runTestsInBrowser(browserType: BrowserType, endpoint: url.UrlWith const testFilesUri = url.format({ pathname: URI.file(path.resolve(optimist.argv.extensionTestsPath)).path, protocol, host, slashes: true }); const folderParam = testWorkspaceUri; - const payloadParam = `[["extensionDevelopmentPath","${testExtensionUri}"],["extensionTestsPath","${testFilesUri}"],["enableProposedApi",""],["webviewExternalEndpointCommit","5319757634f77a050b49c10162939bfe60970c29"]]`; + const payloadParam = `[["extensionDevelopmentPath","${testExtensionUri}"],["extensionTestsPath","${testFilesUri}"],["enableProposedApi",""],["webviewExternalEndpointCommit","5319757634f77a050b49c10162939bfe60970c29"],["skipWelcome","true"]]`; await page.goto(`${endpoint.href}&folder=${folderParam}&payload=${payloadParam}`); diff --git a/test/smoke/src/areas/editor/editor.test.ts b/test/smoke/src/areas/editor/editor.test.ts index 4b50f67a035..1d3b1feddf9 100644 --- a/test/smoke/src/areas/editor/editor.test.ts +++ b/test/smoke/src/areas/editor/editor.test.ts @@ -19,21 +19,5 @@ export function setup(opts: minimist.ParsedArgs) { await app.workbench.quickaccess.openQuickOutline(); await app.workbench.quickinput.waitForQuickInputElements(names => names.length >= 6); }); - - // it('folds/unfolds the code correctly', async function () { - // await app.workbench.quickaccess.openFile('www'); - - // // Fold - // await app.workbench.editor.foldAtLine(3); - // await app.workbench.editor.waitUntilShown(3); - // await app.workbench.editor.waitUntilHidden(4); - // await app.workbench.editor.waitUntilHidden(5); - - // // Unfold - // await app.workbench.editor.unfoldAtLine(3); - // await app.workbench.editor.waitUntilShown(3); - // await app.workbench.editor.waitUntilShown(4); - // await app.workbench.editor.waitUntilShown(5); - // }); }); } diff --git a/test/smoke/src/areas/notebook/notebook.test.ts b/test/smoke/src/areas/notebook/notebook.test.ts index f2970209f36..c7822b83982 100644 --- a/test/smoke/src/areas/notebook/notebook.test.ts +++ b/test/smoke/src/areas/notebook/notebook.test.ts @@ -9,7 +9,7 @@ import { Application } from '../../../../automation'; import { afterSuite, beforeSuite } from '../../utils'; export function setup(opts: minimist.ParsedArgs) { - describe.skip('Notebooks', () => { + describe('Notebooks', () => { beforeSuite(opts); afterEach(async function () { @@ -26,34 +26,34 @@ export function setup(opts: minimist.ParsedArgs) { afterSuite(); - // it('inserts/edits code cell', async function () { - // const app = this.app as Application; - // await app.workbench.notebook.openNotebook(); - // await app.workbench.notebook.focusNextCell(); - // await app.workbench.notebook.insertNotebookCell('code'); - // await app.workbench.notebook.waitForTypeInEditor('// some code'); - // await app.workbench.notebook.stopEditingCell(); - // }); + it.skip('inserts/edits code cell', async function () { + const app = this.app as Application; + await app.workbench.notebook.openNotebook(); + await app.workbench.notebook.focusNextCell(); + await app.workbench.notebook.insertNotebookCell('code'); + await app.workbench.notebook.waitForTypeInEditor('// some code'); + await app.workbench.notebook.stopEditingCell(); + }); - // it('inserts/edits markdown cell', async function () { - // const app = this.app as Application; - // await app.workbench.notebook.openNotebook(); - // await app.workbench.notebook.focusNextCell(); - // await app.workbench.notebook.insertNotebookCell('markdown'); - // await app.workbench.notebook.waitForTypeInEditor('## hello2! '); - // await app.workbench.notebook.stopEditingCell(); - // await app.workbench.notebook.waitForMarkdownContents('h2', 'hello2!'); - // }); + it.skip('inserts/edits markdown cell', async function () { + const app = this.app as Application; + await app.workbench.notebook.openNotebook(); + await app.workbench.notebook.focusNextCell(); + await app.workbench.notebook.insertNotebookCell('markdown'); + await app.workbench.notebook.waitForTypeInEditor('## hello2! '); + await app.workbench.notebook.stopEditingCell(); + await app.workbench.notebook.waitForMarkdownContents('h2', 'hello2!'); + }); - // it('moves focus as it inserts/deletes a cell', async function () { - // const app = this.app as Application; - // await app.workbench.notebook.openNotebook(); - // await app.workbench.notebook.insertNotebookCell('code'); - // await app.workbench.notebook.waitForActiveCellEditorContents(''); - // await app.workbench.notebook.stopEditingCell(); - // await app.workbench.notebook.deleteActiveCell(); - // await app.workbench.notebook.waitForMarkdownContents('p', 'Markdown Cell'); - // }); + it.skip('moves focus as it inserts/deletes a cell', async function () { + const app = this.app as Application; + await app.workbench.notebook.openNotebook(); + await app.workbench.notebook.insertNotebookCell('code'); + await app.workbench.notebook.waitForActiveCellEditorContents(''); + await app.workbench.notebook.stopEditingCell(); + await app.workbench.notebook.deleteActiveCell(); + await app.workbench.notebook.waitForMarkdownContents('p', 'Markdown Cell'); + }); it.skip('moves focus in and out of output', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/113882 const app = this.app as Application;