From c82b479dc27ad649519a048c8c24832579c2eb5e Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Tue, 3 Sep 2024 21:34:15 -0400
Subject: [PATCH 1/2] Fix mocking Chrome API for Electron

---
 extension/src/app/Actions.tsx            | 10 +++-------
 extension/src/background/index.ts        |  1 +
 extension/src/chromeApiMock.ts           | 20 +++++++++++---------
 extension/test/electron/devpanel.spec.js | 10 +++++-----
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/extension/src/app/Actions.tsx b/extension/src/app/Actions.tsx
index 216e59afab..656bb6d67f 100644
--- a/extension/src/app/Actions.tsx
+++ b/extension/src/app/Actions.tsx
@@ -29,11 +29,7 @@ interface OwnProps {
 }
 type Props = StateProps & DispatchProps & OwnProps;
 
-declare global {
-  interface Window {
-    isElectron?: boolean;
-  }
-}
+const isElectron = navigator.userAgent.includes('Electron');
 
 function sendMessage(message: SingleMessage) {
   chrome.runtime.sendMessage(message);
@@ -98,7 +94,7 @@ class Actions extends Component<Props> {
             <DispatcherButton dispatcherIsOpen={this.props.dispatcherIsOpen} />
           )}
           <Divider />
-          {!window.isElectron && (
+          {!isElectron && (
             <Button
               onClick={() => {
                 this.openWindow('window');
@@ -107,7 +103,7 @@ class Actions extends Component<Props> {
               <MdOutlineWindow />
             </Button>
           )}
-          {!window.isElectron && (
+          {!isElectron && (
             <Button
               onClick={() => {
                 this.openWindow('remote');
diff --git a/extension/src/background/index.ts b/extension/src/background/index.ts
index 8573236710..f883147398 100644
--- a/extension/src/background/index.ts
+++ b/extension/src/background/index.ts
@@ -1,3 +1,4 @@
+import '../chromeApiMock';
 import configureStore from './store/backgroundStore';
 import openDevToolsWindow, { DevToolsPosition } from './openWindow';
 import { createMenu, removeMenu } from './contextMenus';
diff --git a/extension/src/chromeApiMock.ts b/extension/src/chromeApiMock.ts
index e6c59523e0..253fd1a46b 100644
--- a/extension/src/chromeApiMock.ts
+++ b/extension/src/chromeApiMock.ts
@@ -1,14 +1,11 @@
 // Mock not supported chrome.* API for Firefox and Electron
 
-window.isElectron =
-  window.navigator && window.navigator.userAgent.indexOf('Electron') !== -1;
-
-const isFirefox = navigator.userAgent.indexOf('Firefox') !== -1;
+const isElectron = navigator.userAgent.includes('Electron');
+const isFirefox = navigator.userAgent.includes('Firefox');
 
 // Background page only
 if (
-  (window.isElectron &&
-    location.pathname === '/_generated_background_page.html') ||
+  (isElectron && location.pathname === '/background.bundle.js') ||
   isFirefox
 ) {
   (chrome.runtime as any).onConnectExternal = {
@@ -18,7 +15,7 @@ if (
     addListener() {},
   };
 
-  if (window.isElectron) {
+  if (isElectron) {
     (chrome.notifications as any) = {
       onClicked: {
         addListener() {},
@@ -31,6 +28,11 @@ if (
         addListener() {},
       },
     };
+    (chrome.commands as any) = {
+      onCommand: {
+        addListener() {},
+      },
+    };
   } else {
     (chrome.storage as any).sync = chrome.storage.local;
     (chrome.runtime as any).onInstalled = {
@@ -39,7 +41,7 @@ if (
   }
 }
 
-if (window.isElectron) {
+if (isElectron) {
   if (!chrome.storage.local || !chrome.storage.local.remove) {
     (chrome.storage as any).local = {
       set(obj: any, callback: any) {
@@ -87,6 +89,6 @@ if (window.isElectron) {
   };
 }
 
-if (isFirefox || window.isElectron) {
+if (isFirefox || isElectron) {
   (chrome.storage as any).sync = chrome.storage.local;
 }
diff --git a/extension/test/electron/devpanel.spec.js b/extension/test/electron/devpanel.spec.js
index 5c37daf5f0..1a7dad60c4 100644
--- a/extension/test/electron/devpanel.spec.js
+++ b/extension/test/electron/devpanel.spec.js
@@ -6,7 +6,7 @@ import chromedriver from 'chromedriver';
 import { switchMonitorTests, delay } from '../utils/e2e';
 
 const devPanelPath =
-  'chrome-extension://lmhkpmbekcpmknklioeibfkpmmfibljd/window.html';
+  'chrome-extension://lmhkpmbekcpmknklioeibfkpmmfibljd/devpanel.html';
 
 describe('DevTools panel for Electron', function () {
   let driver;
@@ -76,7 +76,7 @@ describe('DevTools panel for Electron', function () {
     expect(className).not.toMatch(/hidden/); // not hidden
   });
 
-  it.skip('should have Redux DevTools UI on current tab', async () => {
+  it('should have Redux DevTools UI on current tab', async () => {
     await driver
       .switchTo()
       .frame(
@@ -87,7 +87,7 @@ describe('DevTools panel for Electron', function () {
     await delay(1000);
   });
 
-  it.skip('should contain INIT action', async () => {
+  it('should contain INIT action', async () => {
     const element = await driver.wait(
       webdriver.until.elementLocated(
         webdriver.By.xpath('//div[@data-testid="actionListRows"]'),
@@ -99,7 +99,7 @@ describe('DevTools panel for Electron', function () {
     expect(val).toMatch(/@@INIT/);
   });
 
-  it.skip("should contain Inspector monitor's component", async () => {
+  it("should contain Inspector monitor's component", async () => {
     const val = await driver
       .findElement(webdriver.By.xpath('//div[@data-testid="inspector"]'))
       .getText();
@@ -107,7 +107,7 @@ describe('DevTools panel for Electron', function () {
   });
 
   Object.keys(switchMonitorTests).forEach((description) =>
-    it.skip(description, () => switchMonitorTests[description](driver)),
+    it(description, () => switchMonitorTests[description](driver)),
   );
 
   /*  it('should be no logs in console of main window', async () => {

From 510906f347aebb1bc7dc77e97f896f7d79e6ccd4 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Tue, 3 Sep 2024 21:35:45 -0400
Subject: [PATCH 2/2] Create chilled-feet-marry.md

---
 .changeset/chilled-feet-marry.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/chilled-feet-marry.md

diff --git a/.changeset/chilled-feet-marry.md b/.changeset/chilled-feet-marry.md
new file mode 100644
index 0000000000..ba1abaada5
--- /dev/null
+++ b/.changeset/chilled-feet-marry.md
@@ -0,0 +1,5 @@
+---
+'remotedev-redux-devtools-extension': patch
+---
+
+Fix mocking Chrome API for Electron