Fixed tests.

tonyanziano · tonyanziano · commit 90beb45130fc · 2021-02-02T18:51:49.000-08:00
diff --git a/packages/app/main/src/appMenuBuilder.spec.ts b/packages/app/main/src/appMenuBuilder.spec.ts
@@ -118,6 +118,9 @@ jest.mock('electron', () => ({
     isInvertedColorScheme: jest.fn(() => true),
     on: jest.fn(() => null),
   },
+  nativeTheme: {
+    on: jest.fn(() => null),
+  },
 }));
 
 const mockUpdateStatus = {
diff --git a/packages/app/main/src/commands/azureCommands.spec.ts b/packages/app/main/src/commands/azureCommands.spec.ts
@@ -88,7 +88,7 @@ jest.mock('electron', () => ({
   },
   session: {
     defaultSession: {
-      clearStorageData: (options, cb) => cb(true),
+      clearStorageData: _options => null,
     },
   },
   ipcMain: new Proxy(
diff --git a/packages/app/main/src/commands/electronCommands.spec.ts b/packages/app/main/src/commands/electronCommands.spec.ts
@@ -67,7 +67,7 @@ jest.mock('electron', () => ({
     showMessageBox: (mainBrowserWindow: any, p: { buttons: string[]; type: string; title: string; message: string }) =>
       void 0,
     showOpenDialog: () => void 0,
-    showSaveDialog: () => void 0,
+    showSaveDialogSync: () => void 0,
   },
   shell: {
     get openExternal() {
@@ -197,7 +197,7 @@ describe('the electron commands', () => {
 
   it('should show the save dialog', async () => {
     const handler = registry.getCommand(SharedConstants.Commands.Electron.ShowSaveDialog);
-    const showSaveDialogSpy = jest.spyOn(Electron.dialog, 'showSaveDialog');
+    const showSaveDialogSpy = jest.spyOn(Electron.dialog, 'showSaveDialogSync');
 
     await handler({});
     expect(showSaveDialogSpy).toHaveBeenCalledWith(emulatorApplication.mainWindow.browserWindow, {});
diff --git a/packages/app/main/src/main.spec.ts b/packages/app/main/src/main.spec.ts
@@ -35,10 +35,11 @@ import * as path from 'path';
 
 import { CommandServiceImpl, CommandServiceInstance } from '@bfemulator/sdk-shared';
 import { SharedConstants } from '@bfemulator/app-shared';
-import { systemPreferences } from 'electron';
+import { nativeTheme } from 'electron';
 
 import { emulatorApplication } from './main';
 
+let mockShouldUseInvertedColorScheme = true;
 jest.mock('electron', () => ({
   app: {
     on: () => void 0,
@@ -72,6 +73,12 @@ jest.mock('electron', () => ({
     on: jest.fn(() => null),
     onInvertedColorSchemeChanged: jest.fn(() => true),
   },
+  nativeTheme: {
+    on: jest.fn(() => null),
+    get shouldUseInvertedColorScheme() {
+      return mockShouldUseInvertedColorScheme;
+    },
+  },
 }));
 
 jest.mock('./server/webSocketServer', () => ({
@@ -89,18 +96,19 @@ describe('main', () => {
     const decorator = CommandServiceInstance();
     const descriptor = decorator({ descriptor: {} }, 'none') as any;
     commandService = descriptor.descriptor.get();
+    mockShouldUseInvertedColorScheme = true;
   });
 
   afterEach(() => {
     emulatorAppSpy.mockClear();
   });
 
-  it('should call `onInvertedColorSchemeChanged` when `inverted-color-scheme-changed` event is triggered', () => {
-    const onSpy = jest.spyOn(systemPreferences, 'on');
+  it('should call `onInvertedColorSchemeChanged` when `updated` event is triggered', () => {
+    const onSpy = jest.spyOn(nativeTheme, 'on');
 
     (emulatorApplication as any).initializeSystemPreferencesListeners();
 
-    expect(onSpy).toHaveBeenCalledWith('inverted-color-scheme-changed', jasmine.any(Function));
+    expect(onSpy).toHaveBeenCalledWith('updated', jasmine.any(Function));
 
     onSpy.mockClear();
   });
@@ -123,7 +131,7 @@ describe('main', () => {
   it('should not change to high contrast when theme is not high contrast', () => {
     const commandServiceSpy = jest.spyOn(commandService, 'remoteCall');
 
-    (systemPreferences.isInvertedColorScheme as any).mockImplementationOnce(() => false);
+    mockShouldUseInvertedColorScheme = false;
 
     (emulatorApplication as any).onInvertedColorSchemeChanged();
 
diff --git a/packages/app/main/src/services/azureAuthWorkflowService.spec.ts b/packages/app/main/src/services/azureAuthWorkflowService.spec.ts
@@ -81,6 +81,10 @@ jest.mock('electron', () => ({
       // no-op
     }
 
+    removeMenu() {
+      // no-op
+    }
+
     addListener(type: string, handler: () => void) {
       this.listeners.push({ type, handler });
       MockBrowserWindow.report('addListener', type, handler);
