fix: focus the window when loading fiddle with protocol (#1018)

* fix: getting the mainWindow from foreground

* Added test for regression

* chore: tweak test

* chore: tweak order of imports

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

src/main/protocol.ts

@@ -6,6 +6,7 @@ import * as nodeUrl from 'url';
 import { IpcEvents } from '../ipc-events';
 import { isDevMode } from '../utils/devmode';
 import { ipcMainManager } from './ipc';
+import { getOrCreateMainWindow } from './windows';
 
 const PROTOCOL = 'electron-fiddle';
 const squirrelPath = path.resolve(
@@ -66,6 +67,7 @@ const handlePotentialProtocolLaunch = (url: string) => {
     default:
       return;
   }
+  getOrCreateMainWindow().focus();
 };
 
 const isProtocolString = (arg: string) => arg.startsWith(`${PROTOCOL}://`);

tests/main/protocol-spec.ts

@@ -11,6 +11,7 @@ import {
   listenForProtocolHandler,
   setupProtocolHandler,
 } from '../../src/main/protocol';
+import { getOrCreateMainWindow } from '../../src/main/windows';
 import { overridePlatform, resetPlatform } from '../utils';
 
 jest.mock('fs');
@@ -176,5 +177,16 @@ describe('protocol', () => {
 
       expect(ipcMainManager.send).toHaveBeenCalledTimes(0);
     });
+
+    it('focuses window when loading a fiddle', () => {
+      listenForProtocolHandler();
+
+      const mainWindow = getOrCreateMainWindow();
+      const handler = (app.on as any).mock.calls[0][1];
+
+      handler({}, 'electron-fiddle://electron/4.0.0/test/path');
+
+      expect(mainWindow.focus).toHaveBeenCalled();
+    });
   });
 });