@theia/playwright 1.24.0-next.40 → 1.24.0-next.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/playwright",
-  "version": "1.24.0-next.40+798f9d08504",
+  "version": "1.24.0-next.43+2ba15749ca9",
   "description": "System tests for Theia",
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "repository": {
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "798f9d08504570fce130b9073d398c6782003c0d"
+  "gitHead": "2ba15749ca9c334f486eacd3e441663a3fa02927"
 }

package/src/theia-explorer-view.ts

@@ -21,7 +21,7 @@ import { TheiaMenuItem } from './theia-menu-item';
 import { TheiaRenameDialog } from './theia-rename-dialog';
 import { TheiaTreeNode } from './theia-tree-node';
 import { TheiaView } from './theia-view';
-import { elementContainsClass, normalizeId } from './util';
+import { elementContainsClass, normalizeId, OSUtil, urlEncodePath } from './util';
 
 const TheiaExplorerViewData = {
     tabSelector: '#shell-tab-explorer-view-container',
@@ -75,16 +75,17 @@ export class TheiaExplorerView extends TheiaView {
     }
 
     async refresh(): Promise<void> {
-        await this.clickButton('__explorer-view-container_title:navigator.refresh');
+        await this.clickButton('navigator.refresh');
     }
 
     async collapseAll(): Promise<void> {
-        await this.clickButton('__explorer-view-container_title:navigator.collapse.all');
+        await this.clickButton('navigator.collapse.all');
     }
 
     protected async clickButton(id: string): Promise<void> {
         await this.activate();
         const viewElement = await this.viewElement();
+        await viewElement?.hover();
         const button = await viewElement?.waitForSelector(`#${normalizeId(id)}`);
         await button?.click();
     }
@@ -161,7 +162,11 @@ export class TheiaExplorerView extends TheiaView {
 
     protected treeNodeId(filePath: string): string {
         const workspacePath = this.app.workspace.path;
-        return `${workspacePath}:${workspacePath}/${filePath}`;
+        const nodeId = `${workspacePath}:${workspacePath}${OSUtil.fileSeparator}${filePath}`;
+        if (OSUtil.isWindows) {
+            return urlEncodePath(nodeId);
+        }
+        return nodeId;
     }
 
     async clickContextMenuItem(file: string, path: string[]): Promise<void> {
@@ -199,8 +204,7 @@ export class TheiaExplorerView extends TheiaView {
 
     async getNumberOfVisibleNodes(): Promise<number> {
         await this.activate();
-        await this.app.quickCommandPalette.type('Refresh in Explorer');
-        await this.app.quickCommandPalette.trigger('File: Refresh in Explorer');
+        await this.refresh();
         const fileStatElements = await this.visibleFileStatNodes(DOT_FILES_FILTER);
         return fileStatElements.length;
     }
@@ -224,6 +228,7 @@ export class TheiaExplorerView extends TheiaView {
         await renameDialog.enterNewName(newName);
         confirm ? await renameDialog.confirm() : await renameDialog.close();
         await renameDialog.waitForClosed();
+        await this.refresh();
     }
 
 }

package/src/theia-quick-command-palette.ts

@@ -16,14 +16,14 @@
 
 import { ElementHandle } from '@playwright/test';
 import { TheiaPageObject } from './theia-page-object';
-import { USER_KEY_TYPING_DELAY } from './util';
+import { OSUtil, USER_KEY_TYPING_DELAY } from './util';
 
 export class TheiaQuickCommandPalette extends TheiaPageObject {
 
     selector = '.quick-input-widget';
 
     async open(): Promise<void> {
-        await this.page.keyboard.press('Control+Shift+p');
+        await this.page.keyboard.press(OSUtil.isMacOS ? 'Meta+Shift+p' : 'Control+Shift+p');
         await this.page.waitForSelector(this.selector);
     }
 

package/src/theia-rename-dialog.ts

@@ -15,13 +15,13 @@
 // *****************************************************************************
 
 import { TheiaDialog } from './theia-dialog';
-import { USER_KEY_TYPING_DELAY } from './util';
+import { OSUtil, USER_KEY_TYPING_DELAY } from './util';
 
 export class TheiaRenameDialog extends TheiaDialog {
 
     async enterNewName(newName: string): Promise<void> {
         const inputField = await this.page.waitForSelector(`${this.blockSelector} .theia-input`);
-        await inputField.press('Control+a');
+        await inputField.press(OSUtil.isMacOS ? 'Meta+a' : 'Control+a');
         await inputField.type(newName, { delay: USER_KEY_TYPING_DELAY });
         await this.page.waitForTimeout(USER_KEY_TYPING_DELAY);
     }

package/src/theia-text-editor.ts

@@ -15,17 +15,20 @@
 // *****************************************************************************
 
 import { ElementHandle } from '@playwright/test';
+import { join } from 'path';
 
 import { TheiaApp } from './theia-app';
 import { TheiaEditor } from './theia-editor';
-import { normalizeId } from './util';
+import { normalizeId, OSUtil, urlEncodePath } from './util';
 
 export class TheiaTextEditor extends TheiaEditor {
 
     constructor(filePath: string, app: TheiaApp) {
+        // shell-tab-code-editor-opener:file:///c%3A/Users/user/AppData/Local/Temp/cloud-ws-JBUhb6/sample.txt:1
+        // code-editor-opener:file:///c%3A/Users/user/AppData/Local/Temp/cloud-ws-JBUhb6/sample.txt:1
         super({
-            tabSelector: normalizeId(`#shell-tab-code-editor-opener:file://${app.workspace.escapedPath}/${filePath}:1`),
-            viewSelector: normalizeId(`#code-editor-opener:file://${app.workspace.escapedPath}/${filePath}:1`) + '.theia-editor'
+            tabSelector: normalizeId(`#shell-tab-code-editor-opener:file://${urlEncodePath(join(app.workspace.escapedPath, OSUtil.fileSeparator, filePath))}:1`),
+            viewSelector: normalizeId(`#code-editor-opener:file://${urlEncodePath(join(app.workspace.escapedPath, OSUtil.fileSeparator, filePath))}:1`) + '.theia-editor'
         }, app);
     }
 

package/src/theia-view.ts

@@ -50,6 +50,7 @@ export class TheiaView extends TheiaPageObject {
         if (!this.data.viewName) {
             throw new Error('View name must be specified to open via command palette');
         }
+        await this.app.quickCommandPalette.type('View: Open View');
         await this.app.quickCommandPalette.trigger('View: Open View...', this.data.viewName);
         await this.waitForVisible();
         return this;

package/src/theia-workspace.ts

@@ -15,9 +15,8 @@
 // *****************************************************************************
 
 import * as fs from 'fs-extra';
-import { tmpdir } from 'os';
-import { sep } from 'path';
-import * as path from 'path';
+import { resolve } from 'path';
+import { OSUtil, urlEncodePath } from './util';
 
 export class TheiaWorkspace {
 
@@ -30,14 +29,14 @@ export class TheiaWorkspace {
      * @param {string[]} pathOfFilesToInitialize Path to files or folders that shall be copied to the workspace
      */
     constructor(protected pathOfFilesToInitialize?: string[]) {
-        this.workspacePath = fs.mkdtempSync(`${tmpdir}${sep}cloud-ws-`);
+        this.workspacePath = fs.mkdtempSync(`${OSUtil.tmpDir}${OSUtil.fileSeparator}cloud-ws-`);
     }
 
     /** Performs the file system operations preparing the workspace location synchronously. */
     initialize(): void {
         if (this.pathOfFilesToInitialize) {
             for (const initPath of this.pathOfFilesToInitialize) {
-                const absoluteInitPath = path.resolve(process.cwd(), initPath);
+                const absoluteInitPath = resolve(process.cwd(), initPath);
                 if (!fs.pathExistsSync(absoluteInitPath)) {
                     throw Error('Workspace does not exist at ' + absoluteInitPath);
                 }
@@ -47,15 +46,23 @@ export class TheiaWorkspace {
     }
 
     get path(): string {
-        return this.workspacePath;
+        let workspacePath = this.workspacePath;
+        if (!OSUtil.osStartsWithFileSeparator(this.workspacePath)) {
+            workspacePath = `${OSUtil.fileSeparator}${workspacePath}`;
+        }
+        if (OSUtil.isWindows) {
+            // Drive letters in windows paths have to be lower case
+            workspacePath = workspacePath.replace(/.:/, matchedChar => matchedChar.toLowerCase());
+        }
+        return workspacePath;
     }
 
     get urlEncodedPath(): string {
-        return this.path.replace(/[\\]/g, '/');
+        return urlEncodePath(this.path);
     }
 
     get escapedPath(): string {
-        return this.path.replace(/:/g, '%3A').replace(/[\\]/g, '%5C');
+        return this.path.replace(/:/g, '%3A');
     }
 
     clear(): void {

package/src/util.ts

@@ -15,6 +15,8 @@
 // *****************************************************************************
 
 import { ElementHandle } from '@playwright/test';
+import { tmpdir, platform } from 'os';
+import { sep } from 'path';
 
 export const USER_KEY_TYPING_DELAY = 80;
 
@@ -23,6 +25,10 @@ export function normalizeId(nodeId: string): string {
     return nodeId.replace(/[.:,%/\\]/g, matchedChar => '\\' + matchedChar);
 }
 
+export function urlEncodePath(path: string): string {
+    return path.replace(/\\/g, '/');
+}
+
 export async function toTextContentArray(items: ElementHandle<SVGElement | HTMLElement>[]): Promise<string[]> {
     const contents = items.map(item => item.textContent());
     const resolvedContents = await Promise.all(contents);
@@ -70,3 +76,16 @@ export async function elementId(element: ElementHandle<SVGElement | HTMLElement>
     if (id === null) { throw new Error('Could not get ID of ' + element); }
     return id;
 }
+
+export namespace OSUtil {
+    export const isWindows = platform() === 'win32';
+    export const isMacOS = platform() === 'darwin';
+    // The platform-specific file separator '\' or '/'.
+    export const fileSeparator = sep;
+    // The platform-specific location of the temporary directory.
+    export const tmpDir = tmpdir();
+
+    export function osStartsWithFileSeparator(path: string): boolean {
+        return path.startsWith(fileSeparator);
+    }
+}