refactor: remove env passing, ensure isolation of window specs

Author: goosewobbler

e2e/wdio.tauri.conf.ts

@@ -122,11 +122,15 @@ switch (envContext.testType) {
   case 'standalone':
     specs = ['./test/tauri/standalone/*.spec.ts'];
     break;
+  case 'window':
+    // Window tests - only window-specific functionality
+    specs = ['./test/tauri/window.spec.ts'];
+    break;
   default:
     // Standard tests - core functionality without specialized test modes
     specs = ['./test/tauri/*.spec.ts'];
-    // Exclude mocking tests for now
-    exclude = ['./test/tauri/mocking.spec.ts'];
+    // Exclude mocking tests and window tests (window tests require splash)
+    exclude = ['./test/tauri/mocking.spec.ts', './test/tauri/window.spec.ts'];
     break;
 }
 
@@ -181,8 +185,6 @@ if (envContext.isMultiremote) {
         'wdio:tauriServiceOptions': {
           appBinaryPath: appBinaryPath,
           appArgs: ['--browser=A'],
-          // Pass environment variables to tauri-driver
-          env: baseEnv,
           // Enable log capture for logging tests
           captureBackendLogs: true,
           captureFrontendLogs: true,
@@ -203,8 +205,6 @@ if (envContext.isMultiremote) {
         'wdio:tauriServiceOptions': {
           appBinaryPath: appBinaryPath,
           appArgs: ['--browser=B'],
-          // Pass environment variables to tauri-driver
-          env: baseEnv,
           // Enable log capture for logging tests
           captureBackendLogs: true,
           captureFrontendLogs: true,
@@ -217,12 +217,6 @@ if (envContext.isMultiremote) {
     },
   };
 } else {
-  // Tauri standard configuration - create base env for tauri-driver
-  const baseEnv: Record<string, string> = {};
-  if (envContext.isSplashEnabled) {
-    baseEnv.ENABLE_SPLASH_WINDOW = 'true';
-  }
-
   capabilities = [
     {
       browserName: 'tauri',
@@ -233,8 +227,6 @@ if (envContext.isMultiremote) {
       'wdio:tauriServiceOptions': {
         appBinaryPath: appBinaryPath,
         appArgs: ['foo', 'bar=baz'],
-        // Pass environment variables to tauri-driver
-        env: baseEnv,
         // Enable log capture for logging tests
         captureBackendLogs: true,
         captureFrontendLogs: true,

packages/tauri-service/src/launcher.ts

@@ -483,10 +483,10 @@ export default class TauriLaunchService {
 
       // Set up environment variables for data directory isolation
       const envVarName = process.platform === 'linux' ? 'XDG_DATA_HOME' : 'TAURI_DATA_DIR';
-      const env = { ...process.env, ...workerOptions.env, [envVarName]: dataDir };
+      process.env[envVarName] = dataDir;
 
       // Spawn tauri-driver for this worker
-      await this.startTauriDriverForWorker(cid, port, nativePort, env, workerOptions);
+      await this.startTauriDriverForWorker(cid, port, nativePort, workerOptions);
 
       // Update capabilities with allocated port so WDIO connects to correct port
       // This is critical - the worker needs to know which port to connect to
@@ -668,7 +668,6 @@ export default class TauriLaunchService {
     workerId: string,
     port: number,
     nativePort: number,
-    env: NodeJS.ProcessEnv,
     options?: TauriServiceOptions,
   ): Promise<void> {
     console.log(`[CONSOLE-DEBUG] startTauriDriverForWorker called for worker-${workerId}`);
@@ -697,23 +696,13 @@ export default class TauriLaunchService {
       log.debug(`[worker-${workerId}] Using native driver: ${nativeDriverPath}`);
     }
 
-    // Extract data directory from env for storage and merge with worker options
-    const customEnv = workerOptions.env || {};
-    const spawnEnv = { ...process.env, ...env, ...customEnv };
-    const dataDir = spawnEnv.XDG_DATA_HOME || spawnEnv.TAURI_DATA_DIR || '';
-
-    // DEBUG: Log key environment variables being passed
-    log.debug(`[worker-${workerId}] Environment debug:`);
-    log.debug(`[worker-${workerId}]   ENABLE_SPLASH_WINDOW: ${spawnEnv.ENABLE_SPLASH_WINDOW || 'not set'}`);
-    log.debug(`[worker-${workerId}]   XDG_DATA_HOME: ${spawnEnv.XDG_DATA_HOME || 'not set'}`);
-    log.debug(`[worker-${workerId}]   TAURI_DATA_DIR: ${spawnEnv.TAURI_DATA_DIR || 'not set'}`);
-    log.debug(`[worker-${workerId}]   DISPLAY: ${spawnEnv.DISPLAY || 'not set'}`);
+    // Extract data directory from env for storage
+    const dataDir = process.env.XDG_DATA_HOME || process.env.TAURI_DATA_DIR || '';
 
     await new Promise<void>((resolve, reject) => {
       const proc = spawn(tauriDriverPath, args, {
         stdio: ['ignore', 'pipe', 'pipe'],
         detached: false,
-        env: spawnEnv,
       });
 
       log.info(`[worker-${workerId}] Spawned process with PID: ${proc.pid ?? 'unknown'}`);
@@ -871,25 +860,13 @@ export default class TauriLaunchService {
     }
 
     return new Promise((resolve, reject) => {
-      // Use process.env as base and merge with any custom env from options
-      const customEnv = options.env || {};
-      const spawnEnv = { ...process.env, ...customEnv };
-
-      // DEBUG: Log key environment variables being passed
-      log.debug(`Environment debug (single driver):`);
-      log.debug(`  ENABLE_SPLASH_WINDOW: ${spawnEnv.ENABLE_SPLASH_WINDOW || 'not set'}`);
-      log.debug(`  XDG_DATA_HOME: ${spawnEnv.XDG_DATA_HOME || 'not set'}`);
-      log.debug(`  TAURI_DATA_DIR: ${spawnEnv.TAURI_DATA_DIR || 'not set'}`);
-      log.debug(`  DISPLAY: ${spawnEnv.DISPLAY || 'not set'}`);
-
       if (process.platform === 'linux') {
-        log.info(`Starting tauri-driver (DISPLAY from environment: ${spawnEnv.DISPLAY || 'not set'})`);
+        log.info(`Starting tauri-driver (DISPLAY from environment: ${process.env.DISPLAY || 'not set'})`);
       }
 
       this.tauriDriverProcess = spawn(tauriDriverPath, args, {
         stdio: ['ignore', 'pipe', 'pipe'],
         detached: false,
-        env: spawnEnv,
       });
 
       // Use readline for line-buffered log handling (fixes Windows chunking issues)

packages/tauri-service/src/types.ts

@@ -14,12 +14,6 @@ export type TauriResult<T = unknown> = BaseTauriResult<T>;
  * - logDir: Custom log directory for standalone mode
  */
 export interface TauriServiceOptions extends BaseTauriServiceOptions {
-  /**
-   * Environment variables to pass to the spawned tauri-driver process
-   * Use this to set environment-specific configurations like ENABLE_SPLASH_WINDOW
-   * @default undefined
-   */
-  env?: Record<string, string>;
   /**
    * Automatically install tauri-driver if not found
    * Requires Rust toolchain (cargo) to be installed
@@ -48,10 +42,6 @@ export interface TauriServiceOptions extends BaseTauriServiceOptions {
 export interface TauriServiceGlobalOptions extends BaseTauriServiceGlobalOptions {
   /**
    * Environment variables to pass to the spawned tauri-driver process
-   * Use this to set environment-specific configurations like ENABLE_SPLASH_WINDOW
-   * @default undefined
-   */
-  env?: Record<string, string>;
   /**
    * Automatically install tauri-driver if not found
    * @default false