@theia/playwright 1.58.0 → 1.58.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/playwright",
-  "version": "1.58.0",
+  "version": "1.58.2",
   "description": "System tests for Theia",
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -47,5 +47,5 @@
     "access": "public"
   },
   "main": "lib/index",
-  "gitHead": "6594f32b9727aea20d88934bf386dee06d08fa5e"
+  "gitHead": "4af367c0a63547aff14a27c98d929ee77a22aafe"
 }

package/src/theia-app-loader.ts

@@ -15,11 +15,8 @@
 // *****************************************************************************
 
 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;
@@ -104,7 +101,7 @@ namespace TheiaElectronAppLoader {
         const appPath = electronConfig.electronAppPath!;
         const pluginsPath = electronConfig.pluginsPath;
         const launchOptions = electronConfig.launchOptions ?? {
-            additionalArgs: ['--no-cluster'],
+            additionalArgs: ['--no-sandbox', '--no-cluster'],
             electronAppPath: appPath,
             pluginsPath: pluginsPath
         };
@@ -122,14 +119,10 @@ namespace TheiaElectronAppLoader {
     export function toPlaywrightOptions(
         electronLaunchOptions: { additionalArgs: string[], electronAppPath: string, pluginsPath?: string } | object,
         workspace?: TheiaWorkspace
-    ): { executablePath: string, args: string[] } | object {
+    ): {
+        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,
@@ -142,7 +135,9 @@ namespace TheiaElectronAppLoader {
                 args.push(workspace.path);
             }
 
-            return { executablePath: executablePath, args: args };
+            return {
+                args: args
+            };
         }
         return electronLaunchOptions;
     }
@@ -159,6 +154,7 @@ export namespace TheiaAppLoader {
             // 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';
+            process.env.THEIA_NO_SPLASH = 'true';
             return TheiaElectronAppLoader.load(args, initialWorkspace, factory);
         }
         const page = await args.browser.newPage();

package/src/theia-workspace.ts

@@ -47,12 +47,14 @@ export class TheiaWorkspace {
 
     get path(): string {
         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());
+        } else {
+            if (!OSUtil.osStartsWithFileSeparator(this.workspacePath)) {
+                workspacePath = `${OSUtil.fileSeparator}${workspacePath}`;
+            }
         }
         return workspacePath;
     }