From b944b58f6eefd4906e3f3613c319f8d46d9142d8 Mon Sep 17 00:00:00 2001
From: Peter Hedenskog <peter@soulgalore.com>
Date: Wed, 18 Dec 2024 04:42:47 +0100
Subject: [PATCH] Fix path to WebPageReplay script + better android handling.
 (#107)

The path to the script didn't worked for the npm installed version
of the testrunner. It also took for granted that you wanted to
run WebPageReplay together with Android phones.
---
 testrunner/src/testrunners/testrunner.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/testrunner/src/testrunners/testrunner.js b/testrunner/src/testrunners/testrunner.js
index 60831ee..1870897 100644
--- a/testrunner/src/testrunners/testrunner.js
+++ b/testrunner/src/testrunners/testrunner.js
@@ -1,6 +1,7 @@
 import { writeFile, readFile, mkdir, rm } from 'node:fs/promises';
 import path from 'node:path';
 import os from 'node:os';
+import { fileURLToPath } from 'node:url';
 
 import { execa } from 'execa';
 import log from 'intel';
@@ -11,6 +12,7 @@ import merge from 'lodash.merge';
 import { queueHandler } from '../queue/queuehandler.js';
 import { getBaseFilePath } from '../util.js';
 const { join } = path;
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
 /**
  * Main function to handle job execution. This testrunner will use
@@ -137,12 +139,19 @@ async function runTest(job, workingDirectory, configFileName, logger) {
     (job.data.extras && job.data.extras.includes('--webpagereplay')) ||
     job.data.config.webpagereplay
   ) {
-    binary = './wpr/replay.sh';
-    environment = {
-      env: {
-        ANDROID: true
-      }
-    };
+    binary = path.resolve(__dirname, '../../wpr/replay.sh');
+
+    if (
+      (job.data.extras && job.data.extras.includes('--android')) ||
+      job.data.config.android
+    ) {
+      environment = {
+        env: {
+          ANDROID: true
+        }
+      };
+    }
+
     const deviceId =
       get(job.data.config, 'browsertime.firefox.android.deviceSerial') ||
       get(job.data.config, 'browsertime.chrome.android.deviceSerial');