From a9ccd48a1f73f285d186a90827284dfce1a31fcd Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Thu, 4 Feb 2021 08:44:06 +0100 Subject: [PATCH] enable extension tests in web --- .../src/areas/extensions/extensions.test.ts | 20 +++++-------------- test/smoke/src/main.ts | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/test/smoke/src/areas/extensions/extensions.test.ts b/test/smoke/src/areas/extensions/extensions.test.ts index a62314cd0e8..72a3460d8fe 100644 --- a/test/smoke/src/areas/extensions/extensions.test.ts +++ b/test/smoke/src/areas/extensions/extensions.test.ts @@ -15,7 +15,9 @@ export function setup() { return; } - await app.workbench.settingsEditor.addUserSetting('webview.experimental.useIframes', 'true'); + if (!app.web) { + await app.workbench.settingsEditor.addUserSetting('webview.experimental.useIframes', 'true'); + } await app.workbench.extensions.openExtensionsViewlet(); @@ -27,24 +29,12 @@ export function setup() { await app.workbench.statusbar.waitForStatusbarText('smoke test', 'VS Code Smoke Test Check'); }); - it(`extension installed by server cli`, async function () { + after(async function () { const app = this.app as Application; - - if (app.quality === Quality.Dev || !app.web) { - this.skip(); + if (app.web) { return; } - await app.workbench.extensions.openExtensionsViewlet(); - - await app.workbench.extensions.openExtension('github.vscode-pull-request-github'); - - await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action.uninstall`); - await this.code.waitForElement(`.extension-editor .monaco-action-bar .action-item:not(.disabled) .extension-action[title="Disable this extension"]`); - }); - - after(async function () { - const app = this.app as Application; await app.workbench.settingsEditor.clearUserSettings(); }); diff --git a/test/smoke/src/main.ts b/test/smoke/src/main.ts index cf3c02b0efb..13023eb50c8 100644 --- a/test/smoke/src/main.ts +++ b/test/smoke/src/main.ts @@ -315,7 +315,7 @@ describe(`VSCode Smoke Tests (${opts.web ? 'Web' : 'Electron'})`, () => { setupDataLanguagesTests(); setupDataEditorTests(); setupDataStatusbarTests(!!opts.web); - if (!opts.web) { setupDataExtensionTests(); } + setupDataExtensionTests(); if (!opts.web) { setupDataMultirootTests(); } if (!opts.web) { setupDataLocalizationTests(); } if (!opts.web) { setupLaunchTests(); }