@theia/playwright 1.48.1 → 1.48.2

package/src/theia-dialog.ts

@@ -1,114 +1,114 @@
-// *****************************************************************************
-// 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 { ElementHandle } from '@playwright/test';
-import { TheiaPageObject } from './theia-page-object';
-
-export class TheiaDialog extends TheiaPageObject {
-
-    protected overlaySelector = '#theia-dialog-shell';
-    protected blockSelector = this.overlaySelector + ' .dialogBlock';
-    protected titleBarSelector = this.blockSelector + ' .dialogTitle';
-    protected titleSelector = this.titleBarSelector + ' > div';
-    protected contentSelector = this.blockSelector + ' .dialogContent > div';
-    protected controlSelector = this.blockSelector + ' .dialogControl';
-    protected errorSelector = this.blockSelector + ' .dialogContent';
-
-    async waitForVisible(): Promise<void> {
-        await this.page.waitForSelector(`${this.blockSelector}`, { state: 'visible' });
-    }
-
-    async waitForClosed(): Promise<void> {
-        await this.page.waitForSelector(`${this.blockSelector}`, { state: 'detached' });
-    }
-
-    async isVisible(): Promise<boolean> {
-        const pouDialogElement = await this.page.$(this.blockSelector);
-        return pouDialogElement ? pouDialogElement.isVisible() : false;
-    }
-
-    async title(): Promise<string | null> {
-        const titleElement = await this.page.waitForSelector(`${this.titleSelector}`);
-        return titleElement.textContent();
-    }
-
-    async waitUntilTitleIsDisplayed(title: string): Promise<void> {
-        await this.page.waitForFunction(predicate => {
-            const element = document.querySelector(predicate.titleSelector);
-            return !!element && element.textContent === predicate.expectedTitle;
-        }, { titleSelector: this.titleSelector, expectedTitle: title });
-    }
-
-    protected async contentElement(): Promise<ElementHandle<SVGElement | HTMLElement>> {
-        return this.page.waitForSelector(this.contentSelector);
-    }
-
-    protected async buttonElement(label: string): Promise<ElementHandle<SVGElement | HTMLElement>> {
-        return this.page.waitForSelector(`${this.controlSelector} button:has-text("${label}")`);
-    }
-
-    protected async buttonElementByClass(buttonClass: string): Promise<ElementHandle<SVGElement | HTMLElement>> {
-        return this.page.waitForSelector(`${this.controlSelector} button${buttonClass}`);
-    }
-
-    protected async validationElement(): Promise<ElementHandle<SVGElement | HTMLElement>> {
-        return this.page.waitForSelector(`${this.errorSelector} div.error`, { state: 'attached' });
-    }
-
-    async getValidationText(): Promise<string | null> {
-        const element = await this.validationElement();
-        return element.textContent();
-    }
-
-    async validationResult(): Promise<boolean> {
-        const validationText = await this.getValidationText();
-        return validationText !== '' ? false : true;
-    }
-
-    async close(): Promise<void> {
-        const closeButton = await this.page.waitForSelector(`${this.titleBarSelector} i.closeButton`);
-        await closeButton.click();
-        await this.waitForClosed();
-    }
-
-    async clickButton(buttonLabel: string): Promise<void> {
-        const buttonElement = await this.buttonElement(buttonLabel);
-        await buttonElement.click();
-    }
-
-    async isButtonDisabled(buttonLabel: string): Promise<boolean> {
-        const buttonElement = await this.buttonElement(buttonLabel);
-        return buttonElement.isDisabled();
-    }
-
-    async clickMainButton(): Promise<void> {
-        const buttonElement = await this.buttonElementByClass('.theia-button.main');
-        await buttonElement.click();
-    }
-
-    async clickSecondaryButton(): Promise<void> {
-        const buttonElement = await this.buttonElementByClass('.theia-button.secondary');
-        await buttonElement.click();
-    }
-
-    async waitUntilMainButtonIsEnabled(): Promise<void> {
-        await this.page.waitForFunction(predicate => {
-            const button = document.querySelector<HTMLButtonElement>(predicate.buttonSelector);
-            return !!button && !button.disabled;
-        }, { buttonSelector: `${this.controlSelector} > button.theia-button.main` });
-    }
-
-}
+// *****************************************************************************
+// 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 { ElementHandle } from '@playwright/test';
+import { TheiaPageObject } from './theia-page-object';
+
+export class TheiaDialog extends TheiaPageObject {
+
+    protected overlaySelector = '#theia-dialog-shell';
+    protected blockSelector = this.overlaySelector + ' .dialogBlock';
+    protected titleBarSelector = this.blockSelector + ' .dialogTitle';
+    protected titleSelector = this.titleBarSelector + ' > div';
+    protected contentSelector = this.blockSelector + ' .dialogContent > div';
+    protected controlSelector = this.blockSelector + ' .dialogControl';
+    protected errorSelector = this.blockSelector + ' .dialogContent';
+
+    async waitForVisible(): Promise<void> {
+        await this.page.waitForSelector(`${this.blockSelector}`, { state: 'visible' });
+    }
+
+    async waitForClosed(): Promise<void> {
+        await this.page.waitForSelector(`${this.blockSelector}`, { state: 'detached' });
+    }
+
+    async isVisible(): Promise<boolean> {
+        const pouDialogElement = await this.page.$(this.blockSelector);
+        return pouDialogElement ? pouDialogElement.isVisible() : false;
+    }
+
+    async title(): Promise<string | null> {
+        const titleElement = await this.page.waitForSelector(`${this.titleSelector}`);
+        return titleElement.textContent();
+    }
+
+    async waitUntilTitleIsDisplayed(title: string): Promise<void> {
+        await this.page.waitForFunction(predicate => {
+            const element = document.querySelector(predicate.titleSelector);
+            return !!element && element.textContent === predicate.expectedTitle;
+        }, { titleSelector: this.titleSelector, expectedTitle: title });
+    }
+
+    protected async contentElement(): Promise<ElementHandle<SVGElement | HTMLElement>> {
+        return this.page.waitForSelector(this.contentSelector);
+    }
+
+    protected async buttonElement(label: string): Promise<ElementHandle<SVGElement | HTMLElement>> {
+        return this.page.waitForSelector(`${this.controlSelector} button:has-text("${label}")`);
+    }
+
+    protected async buttonElementByClass(buttonClass: string): Promise<ElementHandle<SVGElement | HTMLElement>> {
+        return this.page.waitForSelector(`${this.controlSelector} button${buttonClass}`);
+    }
+
+    protected async validationElement(): Promise<ElementHandle<SVGElement | HTMLElement>> {
+        return this.page.waitForSelector(`${this.errorSelector} div.error`, { state: 'attached' });
+    }
+
+    async getValidationText(): Promise<string | null> {
+        const element = await this.validationElement();
+        return element.textContent();
+    }
+
+    async validationResult(): Promise<boolean> {
+        const validationText = await this.getValidationText();
+        return validationText !== '' ? false : true;
+    }
+
+    async close(): Promise<void> {
+        const closeButton = await this.page.waitForSelector(`${this.titleBarSelector} i.closeButton`);
+        await closeButton.click();
+        await this.waitForClosed();
+    }
+
+    async clickButton(buttonLabel: string): Promise<void> {
+        const buttonElement = await this.buttonElement(buttonLabel);
+        await buttonElement.click();
+    }
+
+    async isButtonDisabled(buttonLabel: string): Promise<boolean> {
+        const buttonElement = await this.buttonElement(buttonLabel);
+        return buttonElement.isDisabled();
+    }
+
+    async clickMainButton(): Promise<void> {
+        const buttonElement = await this.buttonElementByClass('.theia-button.main');
+        await buttonElement.click();
+    }
+
+    async clickSecondaryButton(): Promise<void> {
+        const buttonElement = await this.buttonElementByClass('.theia-button.secondary');
+        await buttonElement.click();
+    }
+
+    async waitUntilMainButtonIsEnabled(): Promise<void> {
+        await this.page.waitForFunction(predicate => {
+            const button = document.querySelector<HTMLButtonElement>(predicate.buttonSelector);
+            return !!button && !button.disabled;
+        }, { buttonSelector: `${this.controlSelector} > button.theia-button.main` });
+    }
+
+}

package/src/theia-editor.ts

@@ -1,73 +1,73 @@
-// *****************************************************************************
-// 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';
-import { TheiaView } from './theia-view';
-import { containsClass } from './util';
-
-export abstract class TheiaEditor extends TheiaView {
-
-    async isDirty(): Promise<boolean> {
-        return await this.isTabVisible() && containsClass(this.tabElement(), 'theia-mod-dirty');
-    }
-
-    async save(): Promise<void> {
-        await this.activate();
-        if (!await this.isDirty()) {
-            return;
-        }
-        const fileMenu = await this.app.menuBar.openMenu('File');
-        const saveItem = await fileMenu.menuItemByName('Save');
-        await saveItem?.click();
-        await this.page.waitForSelector(this.tabSelector + '.theia-mod-dirty', { state: 'detached' });
-    }
-
-    async closeWithoutSave(): Promise<void> {
-        if (!await this.isDirty()) {
-            return super.close(true);
-        }
-        await super.close(false);
-        const saveDialog = new TheiaDialog(this.app);
-        await saveDialog.clickButton('Don\'t save');
-        await super.waitUntilClosed();
-    }
-
-    async saveAndClose(): Promise<void> {
-        await this.save();
-        await this.close();
-    }
-
-    async undo(times = 1): Promise<void> {
-        await this.activate();
-        for (let i = 0; i < times; i++) {
-            const editMenu = await this.app.menuBar.openMenu('Edit');
-            const undoItem = await editMenu.menuItemByName('Undo');
-            await undoItem?.click();
-            await this.app.page.waitForTimeout(200);
-        }
-    }
-
-    async redo(times = 1): Promise<void> {
-        await this.activate();
-        for (let i = 0; i < times; i++) {
-            const editMenu = await this.app.menuBar.openMenu('Edit');
-            const undoItem = await editMenu.menuItemByName('Redo');
-            await undoItem?.click();
-            await this.app.page.waitForTimeout(200);
-        }
-    }
-
-}
+// *****************************************************************************
+// 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';
+import { TheiaView } from './theia-view';
+import { containsClass } from './util';
+
+export abstract class TheiaEditor extends TheiaView {
+
+    async isDirty(): Promise<boolean> {
+        return await this.isTabVisible() && containsClass(this.tabElement(), 'theia-mod-dirty');
+    }
+
+    async save(): Promise<void> {
+        await this.activate();
+        if (!await this.isDirty()) {
+            return;
+        }
+        const fileMenu = await this.app.menuBar.openMenu('File');
+        const saveItem = await fileMenu.menuItemByName('Save');
+        await saveItem?.click();
+        await this.page.waitForSelector(this.tabSelector + '.theia-mod-dirty', { state: 'detached' });
+    }
+
+    async closeWithoutSave(): Promise<void> {
+        if (!await this.isDirty()) {
+            return super.close(true);
+        }
+        await super.close(false);
+        const saveDialog = new TheiaDialog(this.app);
+        await saveDialog.clickButton('Don\'t save');
+        await super.waitUntilClosed();
+    }
+
+    async saveAndClose(): Promise<void> {
+        await this.save();
+        await this.close();
+    }
+
+    async undo(times = 1): Promise<void> {
+        await this.activate();
+        for (let i = 0; i < times; i++) {
+            const editMenu = await this.app.menuBar.openMenu('Edit');
+            const undoItem = await editMenu.menuItemByName('Undo');
+            await undoItem?.click();
+            await this.app.page.waitForTimeout(200);
+        }
+    }
+
+    async redo(times = 1): Promise<void> {
+        await this.activate();
+        for (let i = 0; i < times; i++) {
+            const editMenu = await this.app.menuBar.openMenu('Edit');
+            const undoItem = await editMenu.menuItemByName('Redo');
+            await undoItem?.click();
+            await this.app.page.waitForTimeout(200);
+        }
+    }
+
+}