From b05c098f2a928145539b37f8cc33e32b721e050a Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Wed, 23 Sep 2020 16:26:35 -0700
Subject: [PATCH] cherrypick(release-1.4): throw unexpected platform error upon
 call (#3946)

Cherry-pick:
- PR #3943 SHA 0090cd943c8c724cb0fe8b02f4fd7f7e7ba837bd

References #3919 and #3935

Co-authored-by: Pavel Feldman <pavel.feldman@gmail.com>
---
 src/client/browserType.ts | 2 ++
 src/server/browserType.ts | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/client/browserType.ts b/src/client/browserType.ts
index 824a59804f..7e6fc9c751 100644
--- a/src/client/browserType.ts
+++ b/src/client/browserType.ts
@@ -54,6 +54,8 @@ export class BrowserType extends ChannelOwner<channels.BrowserTypeChannel, chann
   }
 
   executablePath(): string {
+    if (!this._initializer.executablePath)
+      throw new Error('Browser is not supported on current platform');
     return this._initializer.executablePath;
   }
 
diff --git a/src/server/browserType.ts b/src/server/browserType.ts
index ddf2ef0a43..8c033119f8 100644
--- a/src/server/browserType.ts
+++ b/src/server/browserType.ts
@@ -47,7 +47,7 @@ type WebSocketNotPipe = { webSocketRegex: RegExp, stream: 'stdout' | 'stderr' };
 
 export abstract class BrowserTypeBase implements BrowserType {
   private _name: string;
-  private _executablePath: string | undefined;
+  private _executablePath: string;
   private _webSocketNotPipe: WebSocketNotPipe | null;
   private _browserDescriptor: browserPaths.BrowserDescriptor;
   readonly _browserPath: string;
@@ -57,13 +57,11 @@ export abstract class BrowserTypeBase implements BrowserType {
     const browsersPath = browserPaths.browsersPath(packagePath);
     this._browserDescriptor = browser;
     this._browserPath = browserPaths.browserDirectory(browsersPath, browser);
-    this._executablePath = browserPaths.executablePath(this._browserPath, browser);
+    this._executablePath = browserPaths.executablePath(this._browserPath, browser) || '';
     this._webSocketNotPipe = webSocketOrPipe;
   }
 
   executablePath(): string {
-    if (!this._executablePath)
-      throw new Error('Browser is not supported on current platform');
     return this._executablePath;
   }