test: update tests to support updated deps

Author: wardellbagby

apps/electron/test/ui/electron.spec.ts

@@ -4,15 +4,14 @@ import addCommonUiTests, {
   useMockDefinitions,
   useMockRhymes,
 } from '@lyricistant/common-ui-tests';
-import { deleteAsync as del } from 'del';
 import { _electron as electron, ElectronApplication, Page } from 'playwright';
-import { getDocument, getQueriesForElement } from 'playwright-testing-library';
 import waitForExpect from 'wait-for-expect';
+import * as fs from 'node:fs';
 
 const viewports = [
-  { label: 'default', isSmallLayout: false },
-  { width: 500, height: 500, label: '500 x 500', isSmallLayout: true },
-  { width: 1200, height: 1200, label: '1200 x 1200', isSmallLayout: false },
+  { label: 'default' },
+  { width: 500, height: 500, label: '500 x 500' },
+  { width: 1200, height: 1200, label: '1200 x 1200' },
 ] as const;
 
 describe.each(viewports)('Electron launch - $label', (viewport) => {
@@ -22,9 +21,7 @@ describe.each(viewports)('Electron launch - $label', (viewport) => {
 
   beforeEach(async () => {
     tempDir = path.resolve(os.tmpdir(), 'lyricistant-electron-test');
-    await del(tempDir, {
-      force: true,
-    });
+    fs.rmSync(tempDir, { recursive: true, force: true });
     app = await electron.launch({
       args: [
         path.resolve('apps/electron/dist/test/main.js'),
@@ -50,7 +47,7 @@ describe.each(viewports)('Electron launch - $label', (viewport) => {
     expect(elements).not.toBeEmpty();
 
     await app.evaluate(
-      (electronModule, [newViewport, browserWindow]) => {
+      (_, [newViewport, browserWindow]) => {
         if (newViewport.label === 'default') {
           return;
         } else {
@@ -79,23 +76,7 @@ describe.each(viewports)('Electron launch - $label', (viewport) => {
     await waitForExpect(() => expect(window.title()).resolves.toBe('Untitled'));
   });
 
-  it('shows the basic components', async () => {
-    const components = [
-      await window.$('_react=Editor'),
-      await window.$('_react=Menu'),
-      await window.$('_react=Rhymes'),
-    ];
-
-    for (const component of components) {
-      await waitForExpect(
-        async () => await expect(component.isVisible()).resolves.toBeTruthy(),
-      );
-    }
-  });
-
   addCommonUiTests(async () => ({
     page: window,
-    screen: getQueriesForElement(await getDocument(window)),
-    isSmallLayout: viewport.isSmallLayout,
   }));
 });

apps/electron/test/unit/MenuTest.spec.ts

@@ -1,112 +1,103 @@
+import expect from 'expect';
 import { createAppMenu, MenuItemHandlers } from '@electron-app/app-menu';
-import { expect, use } from 'chai';
 import { MenuItemConstructorOptions } from 'electron';
-import sinonChai from 'sinon-chai';
-import { StubbedInstance, stubObject } from 'ts-sinon';
-
-use(sinonChai);
+import { DeepMockProxy, mockDeep } from 'jest-mock-extended';
 
 describe('Create Electron App Menu', () => {
-  const handlerObj: MenuItemHandlers = {
-    onFindClicked: () => undefined,
-    onNewClicked: () => undefined,
-    onOpenClicked: () => undefined,
-    onOpenRecentClicked: () => undefined,
-    onPreferencesClicked: () => undefined,
-    onAboutClicked: () => undefined,
-    onQuitClicked: () => undefined,
-    onRedoClicked: () => undefined,
-    onReplaceClicked: () => undefined,
-    onSaveAsClicked: () => undefined,
-    onSaveClicked: () => undefined,
-    onUndoClicked: () => undefined,
-  };
-  let handlers: StubbedInstance<MenuItemHandlers>;
+  let handlers: DeepMockProxy<MenuItemHandlers>;
 
   beforeEach(() => {
-    handlers = stubObject<MenuItemHandlers>(handlerObj);
+    jest.resetAllMocks();
+    handlers = mockDeep<MenuItemHandlers>();
 
-    Object.keys(handlerObj)
+    Object.keys(handlers)
       .filter((name) => name.startsWith('on'))
-      .forEach((funcName) => {
-        // @ts-expect-error types are lost here due to stubbing
-        handlers[funcName]
-          .onSecondCall()
-          .throws(new Error(`${funcName} was registered multiple times!`));
+      .forEach((funcName: keyof MenuItemHandlers) => {
+        handlers[funcName].mockReturnValueOnce().mockImplementation(() => {
+          new Error(`${funcName} was registered multiple times!`);
+        });
       });
   });
 
   it('actually creates a menu', () => {
     const actual = createAppMenu('MyApp', 'linux', handlers);
 
-    expect(actual).to.not.be.null;
-    expect(actual).to.not.be.empty;
+    expect(actual).not.toBeNull();
+    expect(Object.keys(actual)).not.toHaveLength(0);
   });
 
   it('includes the Mac menu when on Mac', () => {
     const actual = createAppMenu('MyApp', 'darwin', handlers);
 
-    expect(actual[0].label).to.be.equal('MyApp');
+    expect(actual[0].label).toBe('MyApp');
   });
 
   it("doesn't show prefs in File when on Mac", () => {
     const actual = createAppMenu('MyApp', 'darwin', handlers);
 
-    expect(actual[1].submenu).to.not.containSubset([{ label: 'Preferences' }]);
+    expect(actual[1].submenu).not.toContainEqual([{ label: 'Preferences' }]);
   });
 
   it("doesn't show quit in File when on Mac", () => {
     const actual = createAppMenu('MyApp', 'darwin', handlers);
 
-    expect(actual[1].submenu).to.not.containSubset([{ label: 'Quit' }]);
+    expect(actual[1].submenu).not.toContainEqual([{ label: 'Quit' }]);
   });
 
   it("doesn't show about in File when on Mac", () => {
     const actual = createAppMenu('MyApp', 'darwin', handlers);
 
-    expect(actual[1].submenu).to.not.containSubset([
+    expect(actual[1].submenu).not.toContainEqual([
       { label: 'About Lyricistant...' },
     ]);
   });
 
   it('does show about in Mac menu when on Mac', () => {
     const actual = createAppMenu('MyApp', 'darwin', handlers);
 
-    expect(actual[0].submenu).to.containSubset([
-      { label: 'About Lyricistant...' },
-    ]);
+    expect(actual[0].submenu).toContainEqual(
+      expect.objectContaining({ label: 'About Lyricistant...' }),
+    );
   });
 
   it('does show prefs in File when on Windows', () => {
     const actual = createAppMenu('MyApp', 'win32', handlers);
 
-    expect(actual[0].submenu).to.containSubset([{ label: 'Preferences' }]);
+    expect(actual[0].submenu).toContainEqual(
+      expect.objectContaining({ label: 'Preferences' }),
+    );
   });
 
   it('does show quit in File when on Windows', () => {
     const actual = createAppMenu('MyApp', 'win32', handlers);
 
-    expect(actual[0].submenu).to.containSubset([{ label: 'Quit' }]);
+    expect(actual[0].submenu).toContainEqual(
+      expect.objectContaining({ label: 'Quit' }),
+    );
   });
 
   it('does show about in File when on Windows', () => {
     const actual = createAppMenu('MyApp', 'win32', handlers);
 
-    expect(actual[0].submenu).to.containSubset([
-      { label: 'About Lyricistant...' },
-    ]);
+    expect(actual[0].submenu).toContainEqual(
+      expect.objectContaining({ label: 'About Lyricistant...' }),
+    );
   });
 
   it('does show prefs in File when on Linux', () => {
     const actual = createAppMenu('MyApp', 'linux', handlers);
 
-    expect(actual[0].submenu).to.containSubset([{ label: 'Preferences' }]);
+    expect(actual[0].submenu).toContainEqual(
+      expect.objectContaining({ label: 'Preferences' }),
+    );
   });
 
   it('does show quit in File when on Linux', () => {
     const actual = createAppMenu('MyApp', 'linux', handlers);
 
-    expect(actual[0].submenu).to.containSubset([{ label: 'Quit' }]);
+    expect(actual[0].submenu).toContainEqual(
+      expect.objectContaining({ label: 'Quit' }),
+    );
   });
 
   it('includes all of the major sections on Mac', () => {
@@ -119,7 +110,7 @@ describe('Create Electron App Menu', () => {
     const actual = createAppMenu('MyApp', 'darwin', handlers);
 
     actual.forEach((menu, index) => {
-      expect(menu).to.include(expected[index]);
+      expect(menu).toMatchObject(expected[index]);
     });
   });
 
@@ -128,7 +119,7 @@ describe('Create Electron App Menu', () => {
     const actual = createAppMenu('MyApp', 'linux', handlers);
 
     actual.forEach((menu, index) => {
-      expect(menu).to.include(expected[index]);
+      expect(menu).toMatchObject(expected[index]);
     });
   });
 
@@ -137,7 +128,7 @@ describe('Create Electron App Menu', () => {
     const actual = createAppMenu('MyApp', 'win32', handlers);
 
     actual.forEach((menu, index) => {
-      expect(menu).to.include(expected[index]);
+      expect(menu).toMatchObject(expected[index]);
     });
   });
 
@@ -147,8 +138,8 @@ describe('Create Electron App Menu', () => {
       ({ label }) => label === 'Open recent',
     );
 
-    expect(recents).to.exist;
-    expect(recents.submenu).to.eql([
+    expect(recents).toBeDefined();
+    expect(recents.submenu).toEqual([
       {
         label: '<No recent files>',
         enabled: false,
@@ -163,9 +154,9 @@ describe('Create Electron App Menu', () => {
       ({ label }) => label === 'Open recent',
     );
 
-    expect(recents).to.exist;
+    expect(recents).toBeDefined();
     (recents.submenu as MenuItemConstructorOptions[]).forEach((menu, index) => {
-      expect(menu).to.include({ label: recentFiles[index] });
+      expect(menu).toMatchObject({ label: recentFiles[index] });
     });
   });