@theia/playwright 1.48.1 → 1.48.2

package/src/tests/theia-workspace.test.ts

@@ -1,80 +1,80 @@
-// *****************************************************************************
-// Copyright (C) 2021 logi.cals GmbH, EclipseSource and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { expect, test } from '@playwright/test';
-import { TheiaAppLoader } from '../theia-app-loader';
-import { DOT_FILES_FILTER, TheiaExplorerView } from '../theia-explorer-view';
-import { TheiaWorkspace } from '../theia-workspace';
-
-test.describe('Theia Workspace', () => {
-    let isElectron: boolean;
-    test.beforeAll(async ({ playwright, browser }) => {
-        isElectron = process.env.USE_ELECTRON === 'true';
-    });
-
-    test('should be initialized empty by default', async ({ playwright, browser }) => {
-        if (!isElectron) {
-            const app = await TheiaAppLoader.load({ playwright, browser });
-            const explorer = await app.openView(TheiaExplorerView);
-            const fileStatElements = await explorer.visibleFileStatNodes(DOT_FILES_FILTER);
-            expect(fileStatElements.length).toBe(0);
-            await app.page.close();
-        }
-    });
-
-    test('should be initialized with the contents of a file location', async ({ playwright, browser }) => {
-        const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']);
-        const app = await TheiaAppLoader.load({ playwright, browser }, ws);
-        const explorer = await app.openView(TheiaExplorerView);
-        // resources/sample-files1 contains two folders and one file
-        expect(await explorer.existsDirectoryNode('sampleFolder')).toBe(true);
-        expect(await explorer.existsDirectoryNode('sampleFolderCompact')).toBe(true);
-        expect(await explorer.existsFileNode('sample.txt')).toBe(true);
-        await app.page.close();
-    });
-
-    test('should be initialized with the contents of multiple file locations', async ({ playwright, browser }) => {
-        const ws = new TheiaWorkspace(['src/tests/resources/sample-files1', 'src/tests/resources/sample-files2']);
-        const app = await TheiaAppLoader.load({ playwright, browser }, ws);
-        const explorer = await app.openView(TheiaExplorerView);
-        // resources/sample-files1 contains two folders and one file
-        expect(await explorer.existsDirectoryNode('sampleFolder')).toBe(true);
-        expect(await explorer.existsDirectoryNode('sampleFolderCompact')).toBe(true);
-        expect(await explorer.existsFileNode('sample.txt')).toBe(true);
-        // resources/sample-files2 contains one file
-        expect(await explorer.existsFileNode('another-sample.txt')).toBe(true);
-        await app.page.close();
-    });
-
-    test('open sample.txt via file menu', async ({ playwright, browser }) => {
-        const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']);
-        const app = await TheiaAppLoader.load({ playwright, browser }, ws);
-        const menuEntry = app.isElectron ? 'Open File...' : 'Open...';
-
-        await (await app.menuBar.openMenu('File')).clickMenuItem(menuEntry);
-        const fileDialog = await app.page.waitForSelector('div[class="dialogBlock"]');
-        expect(await fileDialog.isVisible()).toBe(true);
-
-        const fileEntry = app.page.getByText('sample.txt');
-        await fileEntry.click();
-        await app.page.locator('#theia-dialog-shell').getByRole('button', { name: 'Open' }).click();
-
-        const span = await app.page.waitForSelector('span:has-text("content line 2")');
-        expect(await span.isVisible()).toBe(true);
-        await app.page.close();
-    });
-
-});
+// *****************************************************************************
+// Copyright (C) 2021 logi.cals GmbH, EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { expect, test } from '@playwright/test';
+import { TheiaAppLoader } from '../theia-app-loader';
+import { DOT_FILES_FILTER, TheiaExplorerView } from '../theia-explorer-view';
+import { TheiaWorkspace } from '../theia-workspace';
+
+test.describe('Theia Workspace', () => {
+    let isElectron: boolean;
+    test.beforeAll(async ({ playwright, browser }) => {
+        isElectron = process.env.USE_ELECTRON === 'true';
+    });
+
+    test('should be initialized empty by default', async ({ playwright, browser }) => {
+        if (!isElectron) {
+            const app = await TheiaAppLoader.load({ playwright, browser });
+            const explorer = await app.openView(TheiaExplorerView);
+            const fileStatElements = await explorer.visibleFileStatNodes(DOT_FILES_FILTER);
+            expect(fileStatElements.length).toBe(0);
+            await app.page.close();
+        }
+    });
+
+    test('should be initialized with the contents of a file location', async ({ playwright, browser }) => {
+        const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']);
+        const app = await TheiaAppLoader.load({ playwright, browser }, ws);
+        const explorer = await app.openView(TheiaExplorerView);
+        // resources/sample-files1 contains two folders and one file
+        expect(await explorer.existsDirectoryNode('sampleFolder')).toBe(true);
+        expect(await explorer.existsDirectoryNode('sampleFolderCompact')).toBe(true);
+        expect(await explorer.existsFileNode('sample.txt')).toBe(true);
+        await app.page.close();
+    });
+
+    test('should be initialized with the contents of multiple file locations', async ({ playwright, browser }) => {
+        const ws = new TheiaWorkspace(['src/tests/resources/sample-files1', 'src/tests/resources/sample-files2']);
+        const app = await TheiaAppLoader.load({ playwright, browser }, ws);
+        const explorer = await app.openView(TheiaExplorerView);
+        // resources/sample-files1 contains two folders and one file
+        expect(await explorer.existsDirectoryNode('sampleFolder')).toBe(true);
+        expect(await explorer.existsDirectoryNode('sampleFolderCompact')).toBe(true);
+        expect(await explorer.existsFileNode('sample.txt')).toBe(true);
+        // resources/sample-files2 contains one file
+        expect(await explorer.existsFileNode('another-sample.txt')).toBe(true);
+        await app.page.close();
+    });
+
+    test('open sample.txt via file menu', async ({ playwright, browser }) => {
+        const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']);
+        const app = await TheiaAppLoader.load({ playwright, browser }, ws);
+        const menuEntry = app.isElectron ? 'Open File...' : 'Open...';
+
+        await (await app.menuBar.openMenu('File')).clickMenuItem(menuEntry);
+        const fileDialog = await app.page.waitForSelector('div[class="dialogBlock"]');
+        expect(await fileDialog.isVisible()).toBe(true);
+
+        const fileEntry = app.page.getByText('sample.txt');
+        await fileEntry.click();
+        await app.page.locator('#theia-dialog-shell').getByRole('button', { name: 'Open' }).click();
+
+        const span = await app.page.waitForSelector('span:has-text("content line 2")');
+        expect(await span.isVisible()).toBe(true);
+        await app.page.close();
+    });
+
+});

package/src/theia-about-dialog.ts

@@ -1,26 +1,26 @@
-// *****************************************************************************
-// Copyright (C) 2021 logi.cals GmbH, EclipseSource and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { TheiaDialog } from './theia-dialog';
-
-export class TheiaAboutDialog extends TheiaDialog {
-
-    override async isVisible(): Promise<boolean> {
-        const dialog = await this.page.$(`${this.blockSelector} .theia-aboutDialog`);
-        return !!dialog && dialog.isVisible();
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2021 logi.cals GmbH, EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { TheiaDialog } from './theia-dialog';
+
+export class TheiaAboutDialog extends TheiaDialog {
+
+    override async isVisible(): Promise<boolean> {
+        const dialog = await this.page.$(`${this.blockSelector} .theia-aboutDialog`);
+        return !!dialog && dialog.isVisible();
+    }
+
+}

package/src/theia-app-loader.ts

@@ -1,167 +1,167 @@
-// *****************************************************************************
-// Copyright (C) 2022 STMicroelectronics and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { Page, PlaywrightWorkerArgs, _electron as electron } from '@playwright/test';
-import * as path from 'path';
-import * as fs from 'fs';
-import { TheiaApp } from './theia-app';
-import { TheiaWorkspace } from './theia-workspace';
-import { OSUtil } from './util';
-
-export interface TheiaAppFactory<T extends TheiaApp> {
-    new(page: Page, initialWorkspace?: TheiaWorkspace, isElectron?: boolean): T;
-}
-
-// TODO this is just a sketch, we need a proper way to configure tests and pass this configuration to the `TheiaAppLoader`:
-export interface TheiaPlaywrightTestConfig {
-    useElectron?: {
-        /** Path to the Theia Electron app package (absolute or relative to this package). */
-        electronAppPath?: string,
-        /** Path to the folder containing the plugins to load (absolute or relative to this package). */
-        pluginsPath?: string,
-        // eslint-disable-next-line max-len
-        /** Electron launch options as [specified by Playwright](https://github.com/microsoft/playwright/blob/396487fc4c19bf27554eac9beea9db135e96cfb4/packages/playwright-core/types/types.d.ts#L14182). */
-        launchOptions?: object,
-    }
-}
-
-function theiaAppFactory<T extends TheiaApp>(factory?: TheiaAppFactory<T>): TheiaAppFactory<T> {
-    return (factory ?? TheiaApp) as TheiaAppFactory<T>;
-}
-
-function initializeWorkspace(initialWorkspace?: TheiaWorkspace): TheiaWorkspace {
-    const workspace = initialWorkspace ? initialWorkspace : new TheiaWorkspace();
-    workspace.initialize();
-    return workspace;
-}
-
-namespace TheiaBrowserAppLoader {
-
-    export async function load<T extends TheiaApp>(
-        page: Page,
-        initialWorkspace?: TheiaWorkspace,
-        factory?: TheiaAppFactory<T>
-    ): Promise<T> {
-        const workspace = initializeWorkspace(initialWorkspace);
-        return createAndLoad<T>(page, workspace, factory);
-    }
-
-    async function createAndLoad<T extends TheiaApp>(
-        page: Page,
-        workspace: TheiaWorkspace,
-        factory?: TheiaAppFactory<T>
-    ): Promise<T> {
-        const appFactory = theiaAppFactory<T>(factory);
-        const app = new appFactory(page, workspace, false);
-        await loadOrReload(app, '/#' + app.workspace.urlEncodedPath);
-        await app.waitForShellAndInitialized();
-        return app;
-    }
-
-    async function loadOrReload(app: TheiaApp, url: string): Promise<void> {
-        if (app.page.url() === url) {
-            await app.page.reload();
-        } else {
-            const wasLoadedAlready = await app.isShellVisible();
-            await app.page.goto(url);
-            if (wasLoadedAlready) {
-                // Theia doesn't refresh on URL change only
-                // So we need to reload if the app was already loaded before
-                await app.page.reload();
-            }
-        }
-    }
-}
-
-namespace TheiaElectronAppLoader {
-
-    export async function load<T extends TheiaApp>(
-        args: TheiaPlaywrightTestConfig & PlaywrightWorkerArgs,
-        initialWorkspace?: TheiaWorkspace,
-        factory?: TheiaAppFactory<T>,
-    ): Promise<T> {
-        const workspace = initializeWorkspace(initialWorkspace);
-        const electronConfig = args.useElectron ?? {
-            electronAppPath: '../electron',
-            pluginsPath: '../../plugins'
-        };
-        if (electronConfig === undefined || electronConfig.launchOptions === undefined && electronConfig.electronAppPath === undefined) {
-            throw Error('The Theia Playwright configuration must either specify `useElectron.electronAppPath` or `useElectron.launchOptions`');
-        }
-        const appPath = electronConfig.electronAppPath!;
-        const pluginsPath = electronConfig.pluginsPath;
-        const launchOptions = electronConfig.launchOptions ?? {
-            additionalArgs: ['--no-cluster'],
-            electronAppPath: appPath,
-            pluginsPath: pluginsPath
-        };
-        const playwrightOptions = toPlaywrightOptions(launchOptions, workspace);
-        console.log(`Launching Electron with options: ${JSON.stringify(playwrightOptions)}`);
-        const electronApp = await electron.launch(playwrightOptions);
-        const page = await electronApp.firstWindow();
-
-        const appFactory = theiaAppFactory<T>(factory);
-        const app = new appFactory(page, workspace, true);
-        await app.waitForShellAndInitialized();
-        return app;
-    }
-
-    export function toPlaywrightOptions(
-        electronLaunchOptions: { additionalArgs: string[], electronAppPath: string, pluginsPath?: string } | object,
-        workspace?: TheiaWorkspace
-    ): { executablePath: string, args: string[] } | object {
-        if ('additionalArgs' in electronLaunchOptions && 'electronAppPath' in electronLaunchOptions) {
-            const executablePath = path.normalize(path.join(electronLaunchOptions.electronAppPath, 'node_modules/.bin/electron')) + (OSUtil.isWindows ? '.cmd' : '');
-            if (!fs.existsSync(executablePath)) {
-                const errorMsg = `executablePath: ${executablePath} does not exist`;
-                console.log(errorMsg);
-                throw new Error(errorMsg);
-            }
-            const args = [
-                electronLaunchOptions.electronAppPath,
-                ...electronLaunchOptions.additionalArgs,
-                `--app-project-path=${electronLaunchOptions.electronAppPath}`
-            ];
-            if (electronLaunchOptions.pluginsPath) {
-                args.push(`--plugins=local-dir:${electronLaunchOptions.pluginsPath}`);
-            }
-            if (workspace) {
-                args.push(workspace.path);
-            }
-
-            return { executablePath: executablePath, args: args };
-        }
-        return electronLaunchOptions;
-    }
-}
-
-export namespace TheiaAppLoader {
-
-    export async function load<T extends TheiaApp>(
-        args: TheiaPlaywrightTestConfig & PlaywrightWorkerArgs,
-        initialWorkspace?: TheiaWorkspace,
-        factory?: TheiaAppFactory<T>,
-    ): Promise<T> {
-        if (process.env.USE_ELECTRON === 'true') {
-            // disable native elements and early window to avoid issues with the electron app
-            process.env.THEIA_ELECTRON_DISABLE_NATIVE_ELEMENTS = '1';
-            process.env.THEIA_ELECTRON_NO_EARLY_WINDOW = '1';
-            return TheiaElectronAppLoader.load(args, initialWorkspace, factory);
-        }
-        const page = await args.browser.newPage();
-        return TheiaBrowserAppLoader.load(page, initialWorkspace, factory);
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2022 STMicroelectronics and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Page, PlaywrightWorkerArgs, _electron as electron } from '@playwright/test';
+import * as path from 'path';
+import * as fs from 'fs';
+import { TheiaApp } from './theia-app';
+import { TheiaWorkspace } from './theia-workspace';
+import { OSUtil } from './util';
+
+export interface TheiaAppFactory<T extends TheiaApp> {
+    new(page: Page, initialWorkspace?: TheiaWorkspace, isElectron?: boolean): T;
+}
+
+// TODO this is just a sketch, we need a proper way to configure tests and pass this configuration to the `TheiaAppLoader`:
+export interface TheiaPlaywrightTestConfig {
+    useElectron?: {
+        /** Path to the Theia Electron app package (absolute or relative to this package). */
+        electronAppPath?: string,
+        /** Path to the folder containing the plugins to load (absolute or relative to this package). */
+        pluginsPath?: string,
+        // eslint-disable-next-line max-len
+        /** Electron launch options as [specified by Playwright](https://github.com/microsoft/playwright/blob/396487fc4c19bf27554eac9beea9db135e96cfb4/packages/playwright-core/types/types.d.ts#L14182). */
+        launchOptions?: object,
+    }
+}
+
+function theiaAppFactory<T extends TheiaApp>(factory?: TheiaAppFactory<T>): TheiaAppFactory<T> {
+    return (factory ?? TheiaApp) as TheiaAppFactory<T>;
+}
+
+function initializeWorkspace(initialWorkspace?: TheiaWorkspace): TheiaWorkspace {
+    const workspace = initialWorkspace ? initialWorkspace : new TheiaWorkspace();
+    workspace.initialize();
+    return workspace;
+}
+
+namespace TheiaBrowserAppLoader {
+
+    export async function load<T extends TheiaApp>(
+        page: Page,
+        initialWorkspace?: TheiaWorkspace,
+        factory?: TheiaAppFactory<T>
+    ): Promise<T> {
+        const workspace = initializeWorkspace(initialWorkspace);
+        return createAndLoad<T>(page, workspace, factory);
+    }
+
+    async function createAndLoad<T extends TheiaApp>(
+        page: Page,
+        workspace: TheiaWorkspace,
+        factory?: TheiaAppFactory<T>
+    ): Promise<T> {
+        const appFactory = theiaAppFactory<T>(factory);
+        const app = new appFactory(page, workspace, false);
+        await loadOrReload(app, '/#' + app.workspace.urlEncodedPath);
+        await app.waitForShellAndInitialized();
+        return app;
+    }
+
+    async function loadOrReload(app: TheiaApp, url: string): Promise<void> {
+        if (app.page.url() === url) {
+            await app.page.reload();
+        } else {
+            const wasLoadedAlready = await app.isShellVisible();
+            await app.page.goto(url);
+            if (wasLoadedAlready) {
+                // Theia doesn't refresh on URL change only
+                // So we need to reload if the app was already loaded before
+                await app.page.reload();
+            }
+        }
+    }
+}
+
+namespace TheiaElectronAppLoader {
+
+    export async function load<T extends TheiaApp>(
+        args: TheiaPlaywrightTestConfig & PlaywrightWorkerArgs,
+        initialWorkspace?: TheiaWorkspace,
+        factory?: TheiaAppFactory<T>,
+    ): Promise<T> {
+        const workspace = initializeWorkspace(initialWorkspace);
+        const electronConfig = args.useElectron ?? {
+            electronAppPath: '../electron',
+            pluginsPath: '../../plugins'
+        };
+        if (electronConfig === undefined || electronConfig.launchOptions === undefined && electronConfig.electronAppPath === undefined) {
+            throw Error('The Theia Playwright configuration must either specify `useElectron.electronAppPath` or `useElectron.launchOptions`');
+        }
+        const appPath = electronConfig.electronAppPath!;
+        const pluginsPath = electronConfig.pluginsPath;
+        const launchOptions = electronConfig.launchOptions ?? {
+            additionalArgs: ['--no-cluster'],
+            electronAppPath: appPath,
+            pluginsPath: pluginsPath
+        };
+        const playwrightOptions = toPlaywrightOptions(launchOptions, workspace);
+        console.log(`Launching Electron with options: ${JSON.stringify(playwrightOptions)}`);
+        const electronApp = await electron.launch(playwrightOptions);
+        const page = await electronApp.firstWindow();
+
+        const appFactory = theiaAppFactory<T>(factory);
+        const app = new appFactory(page, workspace, true);
+        await app.waitForShellAndInitialized();
+        return app;
+    }
+
+    export function toPlaywrightOptions(
+        electronLaunchOptions: { additionalArgs: string[], electronAppPath: string, pluginsPath?: string } | object,
+        workspace?: TheiaWorkspace
+    ): { executablePath: string, args: string[] } | object {
+        if ('additionalArgs' in electronLaunchOptions && 'electronAppPath' in electronLaunchOptions) {
+            const executablePath = path.normalize(path.join(electronLaunchOptions.electronAppPath, 'node_modules/.bin/electron')) + (OSUtil.isWindows ? '.cmd' : '');
+            if (!fs.existsSync(executablePath)) {
+                const errorMsg = `executablePath: ${executablePath} does not exist`;
+                console.log(errorMsg);
+                throw new Error(errorMsg);
+            }
+            const args = [
+                electronLaunchOptions.electronAppPath,
+                ...electronLaunchOptions.additionalArgs,
+                `--app-project-path=${electronLaunchOptions.electronAppPath}`
+            ];
+            if (electronLaunchOptions.pluginsPath) {
+                args.push(`--plugins=local-dir:${electronLaunchOptions.pluginsPath}`);
+            }
+            if (workspace) {
+                args.push(workspace.path);
+            }
+
+            return { executablePath: executablePath, args: args };
+        }
+        return electronLaunchOptions;
+    }
+}
+
+export namespace TheiaAppLoader {
+
+    export async function load<T extends TheiaApp>(
+        args: TheiaPlaywrightTestConfig & PlaywrightWorkerArgs,
+        initialWorkspace?: TheiaWorkspace,
+        factory?: TheiaAppFactory<T>,
+    ): Promise<T> {
+        if (process.env.USE_ELECTRON === 'true') {
+            // disable native elements and early window to avoid issues with the electron app
+            process.env.THEIA_ELECTRON_DISABLE_NATIVE_ELEMENTS = '1';
+            process.env.THEIA_ELECTRON_NO_EARLY_WINDOW = '1';
+            return TheiaElectronAppLoader.load(args, initialWorkspace, factory);
+        }
+        const page = await args.browser.newPage();
+        return TheiaBrowserAppLoader.load(page, initialWorkspace, factory);
+    }
+}