From 5410c30908f05fddd01c9406469300d1e97bf31b Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Sat, 15 Aug 2020 04:34:42 +0200
Subject: [PATCH] chore(test): fix tests when using browser path overwrites
 (#3453)

---
 test/base.fixture.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/test/base.fixture.ts b/test/base.fixture.ts
index dfe20f54ad..c781ea5b04 100644
--- a/test/base.fixture.ts
+++ b/test/base.fixture.ts
@@ -86,14 +86,19 @@ registerWorkerFixture('httpService', async ({parallelIndex}, test) => {
   ]);
 });
 
-registerWorkerFixture('defaultBrowserOptions', async({}, test) => {
-  let executablePath = undefined;
+const getExecutablePath = () => {
   if (browserName === 'chromium' && process.env.CRPATH)
-    executablePath = process.env.CRPATH;
+    return process.env.CRPATH;
   if (browserName === 'firefox' && process.env.FFPATH)
-    executablePath = process.env.FFPATH;
+    return process.env.FFPATH;
   if (browserName === 'webkit' && process.env.WKPATH)
-    executablePath = process.env.WKPATH;
+    return process.env.WKPATH;
+  return
+}
+
+registerWorkerFixture('defaultBrowserOptions', async({}, test) => {
+  let executablePath = getExecutablePath();
+
   if (executablePath)
     console.error(`Using executable at ${executablePath}`);
   await test({
@@ -147,7 +152,11 @@ registerFixture('toImpl', async ({playwright}, test) => {
 });
 
 registerWorkerFixture('browserType', async ({playwright}, test) => {
-  await test(playwright[process.env.BROWSER || 'chromium']);
+  const browserType = playwright[process.env.BROWSER || 'chromium']
+  const executablePath = getExecutablePath()
+  if (executablePath)
+    browserType._executablePath = executablePath
+  await test(browserType);
 });
 
 registerWorkerFixture('browser', async ({browserType, defaultBrowserOptions}, test) => {