diff --git a/addons/xterm-addon-attach/src/AttachAddon.api.ts b/addons/xterm-addon-attach/src/AttachAddon.api.ts index fdef5c41..625e1b4d 100644 --- a/addons/xterm-addon-attach/src/AttachAddon.api.ts +++ b/addons/xterm-addon-attach/src/AttachAddon.api.ts @@ -16,7 +16,7 @@ const height = 600; describe('AttachAddon', () => { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/addons/xterm-addon-fit/src/FitAddon.api.ts b/addons/xterm-addon-fit/src/FitAddon.api.ts index f154a30e..760a3176 100644 --- a/addons/xterm-addon-fit/src/FitAddon.api.ts +++ b/addons/xterm-addon-fit/src/FitAddon.api.ts @@ -18,7 +18,7 @@ let isFirefox = false; describe('FitAddon', () => { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/addons/xterm-addon-search/src/SearchAddon.api.ts b/addons/xterm-addon-search/src/SearchAddon.api.ts index 741ddea2..21238332 100644 --- a/addons/xterm-addon-search/src/SearchAddon.api.ts +++ b/addons/xterm-addon-search/src/SearchAddon.api.ts @@ -18,7 +18,7 @@ const height = 600; describe('Search Tests', function(): void { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/addons/xterm-addon-serialize/src/SerializeAddon.api.ts b/addons/xterm-addon-serialize/src/SerializeAddon.api.ts index 992f9351..824b4b89 100644 --- a/addons/xterm-addon-serialize/src/SerializeAddon.api.ts +++ b/addons/xterm-addon-serialize/src/SerializeAddon.api.ts @@ -16,7 +16,7 @@ const height = 600; describe('SerializeAddon', () => { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`] diff --git a/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts b/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts index 5729751a..983e795f 100644 --- a/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts +++ b/addons/xterm-addon-unicode11/src/Unicode11Addon.api.ts @@ -16,7 +16,7 @@ const height = 600; describe('Unicode11Addon', () => { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts index 219e7490..b2516cdf 100644 --- a/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts +++ b/addons/xterm-addon-web-links/src/WebLinksAddon.api.ts @@ -16,7 +16,7 @@ const height = 600; describe('WebLinksAddon', () => { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/addons/xterm-addon-webgl/src/WebglRenderer.api.ts b/addons/xterm-addon-webgl/src/WebglRenderer.api.ts index a170132a..cd90ddd9 100644 --- a/addons/xterm-addon-webgl/src/WebglRenderer.api.ts +++ b/addons/xterm-addon-webgl/src/WebglRenderer.api.ts @@ -19,7 +19,7 @@ const height = 600; let itWebgl: (expectation: string, callback?: (this: Mocha.ITestCallbackContext, done: MochaDone) => any) => Mocha.ITest | void; describe('WebGL Renderer Integration Tests', async () => { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); const isHeadless = process.argv.indexOf('--headless') !== -1; // Firefox works only in non-headless mode https://github.com/microsoft/playwright/issues/1032 const areTestsEnabled = browserType.name() === 'chromium' || (browserType.name() === 'firefox' && !isHeadless); @@ -898,7 +898,7 @@ async function getCellColor(col: number, row: number): Promise { } async function setupBrowser(options: ITerminalOptions = { rendererType: 'dom' }): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/test/api/CharWidth.api.ts b/test/api/CharWidth.api.ts index 26cf488e..b5cb5838 100644 --- a/test/api/CharWidth.api.ts +++ b/test/api/CharWidth.api.ts @@ -15,7 +15,7 @@ const height = 600; describe('CharWidth Integration Tests', function(): void { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/test/api/InputHandler.api.ts b/test/api/InputHandler.api.ts index 881a2e35..d4018d90 100644 --- a/test/api/InputHandler.api.ts +++ b/test/api/InputHandler.api.ts @@ -19,7 +19,7 @@ let isChromium = false; describe('InputHandler Integration Tests', function(): void { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); isChromium = browserType.name() === 'chromium'; browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, diff --git a/test/api/MouseTracking.api.ts b/test/api/MouseTracking.api.ts index 4867902e..4d10a987 100644 --- a/test/api/MouseTracking.api.ts +++ b/test/api/MouseTracking.api.ts @@ -208,7 +208,7 @@ function parseReport(encoding: string, msg: number[]): { state: any; row: number * Mouse tracking tests. */ describe('Mouse Tracking Tests', async () => { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browserType.name() === 'chromium'; const itMouse = isChromium ? it : it.skip; diff --git a/test/api/Parser.api.ts b/test/api/Parser.api.ts index 07b677ab..29dcbb0b 100644 --- a/test/api/Parser.api.ts +++ b/test/api/Parser.api.ts @@ -16,7 +16,7 @@ const height = 600; describe('Parser Integration Tests', function(): void { before(async function(): Promise { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/test/api/Terminal.api.ts b/test/api/Terminal.api.ts index 00eba4bb..fce17511 100644 --- a/test/api/Terminal.api.ts +++ b/test/api/Terminal.api.ts @@ -16,7 +16,7 @@ const height = 600; describe('API Integration Tests', function(): void { before(async () => { - const browserType = await getBrowserType(); + const browserType = getBrowserType(); browser = await browserType.launch({ headless: process.argv.indexOf('--headless') !== -1, args: [`--window-size=${width},${height}`, `--no-sandbox`] diff --git a/test/api/TestUtils.ts b/test/api/TestUtils.ts index 60044746..987940d0 100644 --- a/test/api/TestUtils.ts +++ b/test/api/TestUtils.ts @@ -41,7 +41,7 @@ export async function openTerminal(page: playwright.Page, options: ITerminalOpti } } -export async function getBrowserType(): Promise { +export function getBrowserType(): playwright.BrowserType { // Default to chromium let browserType: playwright.BrowserType = playwright['chromium']; @@ -53,7 +53,5 @@ export async function getBrowserType(): Promise { } } - await browserType.downloadBrowserIfNeeded(); - return browserType; }