test: prefer jest API instead of jest-each

Signed-off-by: Kristóf Marussy <kristof@marussy.com>

5 files changed, 11 insertions, 41 deletions

diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts
index ae10677..dc15d68 100644
--- a/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts
+++ b/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts
@@ -21,7 +21,7 @@
 import { URL } from 'node:url';
 
 import { jest } from '@jest/globals';
-import { each, fake } from '@sophie/test-utils';
+import { fake } from '@sophie/test-utils';
 import type {
   OnBeforeRequestListenerDetails,
   PermissionRequestHandlerHandlerDetails,
@@ -100,7 +100,7 @@ it('should set permission request and before request handlers', () => {
   expect(onBeforeRequest).toBeDefined();
 });
 
-each(permissions.map((permission) => [permission])).it(
+it.each(permissions.map((permission) => [permission]))(
   'should reject %s permission requests',
   (permission: Permission) => {
     hardenSession(getFakeResources(false), false, fakeSession);
@@ -114,7 +114,7 @@ each(permissions.map((permission) => [permission])).it(
   },
 );
 
-each([
+it.each([
   [
     false,
     'GET',
@@ -141,7 +141,7 @@ each([
   [true, 'GET', 'https://clients2.google.com/service/update2/crx/aaaa', false],
   [true, 'GET', 'https://clients2.googleusercontent.com/crx/aaaa', false],
   [true, 'GET', 'https://example.com', true],
-]).it(
+])(
   'in dev mode: %s the request %s %s should be cancelled: %s',
   (devMode: boolean, method: string, url: string, cancel: boolean) => {
     hardenSession(getFakeResources(devMode), devMode, fakeSession);
diff --git a/packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts b/packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts
index 635a6b4..8040601 100644
--- a/packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts
+++ b/packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts
@@ -20,8 +20,6 @@
 
 import os from 'node:os';
 
-import { each } from '@sophie/test-utils';
-
 import Resources from '../../Resources';
 import getDistResources from '../getDistResources';
 
@@ -52,7 +50,7 @@ const [
 
 const fileURLs: [string, string] = [rendererIndexFileURL, rendererRootFileURL];
 
-each([
+describe.each([
   ['not in dev mode', false, undefined, ...fileURLs],
   [
     'not in dev mode with VITE_DEV_SERVER_URL set',
@@ -68,12 +66,12 @@ each([
     `${defaultDevServerURL}index.html`,
     defaultDevServerURL,
   ],
-]).describe(
+])(
   'when %s',
   (
     _description: string,
     devMode: boolean,
-    devServerURL: string,
+    devServerURL: string | undefined,
     rendererIndexURL: string,
     rendererRootURL: string,
   ) => {
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 8f7bb0e..4def218 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -10,9 +10,6 @@
     "types": "yarn g:types"
   },
   "dependencies": {
-    "@types/jest": "^27.5.0",
-    "jest": "^28.1.0",
-    "jest-each": "^28.1.0",
     "type-fest": "^2.12.2"
   }
 }
diff --git a/packages/test-utils/src/each.ts b/packages/test-utils/src/each.ts
deleted file mode 100644
index c5271ae..0000000
--- a/packages/test-utils/src/each.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C)  2022 Kristóf Marussy <kristof@marussy.com>
- *
- * This file is part of Sophie.
- *
- * Sophie is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import eachModule from 'jest-each';
-
-// Workaround for jest ESM loader incorrectly wrapping the import in another layer of `default`.
-const each =
-  (eachModule as Partial<typeof import('jest-each')>).default ?? eachModule;
-
-export default each;
diff --git a/packages/test-utils/src/index.ts b/packages/test-utils/src/index.ts
index 1543c6e..c4db5b0 100644
--- a/packages/test-utils/src/index.ts
+++ b/packages/test-utils/src/index.ts
@@ -18,6 +18,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-export { default as each } from './each';
-
+/*
+  eslint-disable-next-line import/prefer-default-export --
+  Keep API consistent for more helpers in the future.
+*/
 export { default as fake } from './fake';