diff options
author | Kristóf Marussy <kristof@marussy.com> | 2022-01-27 18:26:21 +0100 |
---|---|---|
committer | Kristóf Marussy <kristof@marussy.com> | 2022-02-08 21:43:18 +0100 |
commit | bfc1f4d55d02553f761fbc9acc5ed15103455149 (patch) | |
tree | cb1650750c2ff1587f7cd0fd215d2179822568ae /packages | |
parent | refactor: Extract main window hardening (diff) | |
download | sophie-bfc1f4d55d02553f761fbc9acc5ed15103455149.tar.gz sophie-bfc1f4d55d02553f761fbc9acc5ed15103455149.tar.zst sophie-bfc1f4d55d02553f761fbc9acc5ed15103455149.zip |
build: Add test-utils package
Added as a common devDependency, this lets us handle test utility code
from one place.
For now, the main reason for its existence is the workaround code for
importing jest-each from ESM.
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages')
-rw-r--r-- | packages/main/package.json | 2 | ||||
-rw-r--r-- | packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts | 6 | ||||
-rw-r--r-- | packages/main/tsconfig.json | 3 | ||||
-rw-r--r-- | packages/test-utils/.eslintrc.cjs | 6 | ||||
-rw-r--r-- | packages/test-utils/package.json | 17 | ||||
-rw-r--r-- | packages/test-utils/src/each.ts | 27 | ||||
-rw-r--r-- | packages/test-utils/src/index.ts | 22 | ||||
-rw-r--r-- | packages/test-utils/tsconfig.build.json | 10 | ||||
-rw-r--r-- | packages/test-utils/tsconfig.json | 12 |
9 files changed, 99 insertions, 6 deletions
diff --git a/packages/main/package.json b/packages/main/package.json index ea10b84..4f4a6cb 100644 --- a/packages/main/package.json +++ b/packages/main/package.json | |||
@@ -27,6 +27,7 @@ | |||
27 | }, | 27 | }, |
28 | "devDependencies": { | 28 | "devDependencies": { |
29 | "@jest/globals": "^27.4.6", | 29 | "@jest/globals": "^27.4.6", |
30 | "@sophie/test-utils": "workspace:*", | ||
30 | "@types/deep-equal": "^1.0.1", | 31 | "@types/deep-equal": "^1.0.1", |
31 | "@types/electron-devtools-installer": "^2.2.1", | 32 | "@types/electron-devtools-installer": "^2.2.1", |
32 | "@types/lodash-es": "^4.17.5", | 33 | "@types/lodash-es": "^4.17.5", |
@@ -38,7 +39,6 @@ | |||
38 | "esbuild": "^0.14.14", | 39 | "esbuild": "^0.14.14", |
39 | "git-repo-info": "^2.1.1", | 40 | "git-repo-info": "^2.1.1", |
40 | "jest": "^27.4.7", | 41 | "jest": "^27.4.7", |
41 | "jest-each": "^27.4.6", | ||
42 | "jest-mock": "^27.4.6", | 42 | "jest-mock": "^27.4.6", |
43 | "source-map-support": "^0.5.21" | 43 | "source-map-support": "^0.5.21" |
44 | } | 44 | } |
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 d045e54..e7e9d71 100644 --- a/packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts +++ b/packages/main/src/infrastructure/resources/impl/__tests__/getDistResources.spec.ts | |||
@@ -20,15 +20,11 @@ | |||
20 | 20 | ||
21 | import os from 'node:os'; | 21 | import os from 'node:os'; |
22 | 22 | ||
23 | import eachModule from 'jest-each'; | 23 | import { each } from '@sophie/test-utils'; |
24 | 24 | ||
25 | import Resources from '../../Resources'; | 25 | import Resources from '../../Resources'; |
26 | import getDistResources from '../getDistResources'; | 26 | import getDistResources from '../getDistResources'; |
27 | 27 | ||
28 | // Workaround for jest ESM loader incorrectly wrapping the import in another layer of `default`. | ||
29 | const each = | ||
30 | (eachModule as Partial<typeof import('jest-each')>).default ?? eachModule; | ||
31 | |||
32 | const defaultDevServerURL = 'http://localhost:3000/'; | 28 | const defaultDevServerURL = 'http://localhost:3000/'; |
33 | 29 | ||
34 | const [ | 30 | const [ |
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json index dad597d..e18e7d3 100644 --- a/packages/main/tsconfig.json +++ b/packages/main/tsconfig.json | |||
@@ -10,6 +10,9 @@ | |||
10 | }, | 10 | }, |
11 | { | 11 | { |
12 | "path": "../shared/tsconfig.build.json" | 12 | "path": "../shared/tsconfig.build.json" |
13 | }, | ||
14 | { | ||
15 | "path": "../test-utils/tsconfig.build.json" | ||
13 | } | 16 | } |
14 | ], | 17 | ], |
15 | "include": [ | 18 | "include": [ |
diff --git a/packages/test-utils/.eslintrc.cjs b/packages/test-utils/.eslintrc.cjs new file mode 100644 index 0000000..548ea34 --- /dev/null +++ b/packages/test-utils/.eslintrc.cjs | |||
@@ -0,0 +1,6 @@ | |||
1 | module.exports = { | ||
2 | env: { | ||
3 | node: true, | ||
4 | browser: false, | ||
5 | }, | ||
6 | }; | ||
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json new file mode 100644 index 0000000..9270af2 --- /dev/null +++ b/packages/test-utils/package.json | |||
@@ -0,0 +1,17 @@ | |||
1 | { | ||
2 | "name": "@sophie/test-utils", | ||
3 | "version": "0.1.0", | ||
4 | "private": true, | ||
5 | "sideEffects": false, | ||
6 | "type": "module", | ||
7 | "types": "dist/index.d.ts", | ||
8 | "scripts": { | ||
9 | "typecheck:workspace": "yarn g:typecheck", | ||
10 | "types": "yarn g:types" | ||
11 | }, | ||
12 | "dependencies": { | ||
13 | "@types/jest": "^27.4.0", | ||
14 | "jest": "^27.4.7", | ||
15 | "jest-each": "^27.4.6" | ||
16 | } | ||
17 | } | ||
diff --git a/packages/test-utils/src/each.ts b/packages/test-utils/src/each.ts new file mode 100644 index 0000000..c5271ae --- /dev/null +++ b/packages/test-utils/src/each.ts | |||
@@ -0,0 +1,27 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2022 Kristóf Marussy <kristof@marussy.com> | ||
3 | * | ||
4 | * This file is part of Sophie. | ||
5 | * | ||
6 | * Sophie is free software: you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU Affero General Public License as | ||
8 | * published by the Free Software Foundation, version 3. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU Affero General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU Affero General Public License | ||
16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
17 | * | ||
18 | * SPDX-License-Identifier: AGPL-3.0-only | ||
19 | */ | ||
20 | |||
21 | import eachModule from 'jest-each'; | ||
22 | |||
23 | // Workaround for jest ESM loader incorrectly wrapping the import in another layer of `default`. | ||
24 | const each = | ||
25 | (eachModule as Partial<typeof import('jest-each')>).default ?? eachModule; | ||
26 | |||
27 | export default each; | ||
diff --git a/packages/test-utils/src/index.ts b/packages/test-utils/src/index.ts new file mode 100644 index 0000000..5de84f1 --- /dev/null +++ b/packages/test-utils/src/index.ts | |||
@@ -0,0 +1,22 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2022 Kristóf Marussy <kristof@marussy.com> | ||
3 | * | ||
4 | * This file is part of Sophie. | ||
5 | * | ||
6 | * Sophie is free software: you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU Affero General Public License as | ||
8 | * published by the Free Software Foundation, version 3. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU Affero General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU Affero General Public License | ||
16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
17 | * | ||
18 | * SPDX-License-Identifier: AGPL-3.0-only | ||
19 | */ | ||
20 | |||
21 | // eslint-disable-next-line import/prefer-default-export -- More exports will be added here. | ||
22 | export { default as each } from './each'; | ||
diff --git a/packages/test-utils/tsconfig.build.json b/packages/test-utils/tsconfig.build.json new file mode 100644 index 0000000..d300514 --- /dev/null +++ b/packages/test-utils/tsconfig.build.json | |||
@@ -0,0 +1,10 @@ | |||
1 | { | ||
2 | "extends": "../../config/tsconfig.base.json", | ||
3 | "compilerOptions": { | ||
4 | "composite": true, | ||
5 | "declarationDir": "dist", | ||
6 | "emitDeclarationOnly": true, | ||
7 | "rootDir": "src" | ||
8 | }, | ||
9 | "include": ["src/**/*.ts"] | ||
10 | } | ||
diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json new file mode 100644 index 0000000..d01eb81 --- /dev/null +++ b/packages/test-utils/tsconfig.json | |||
@@ -0,0 +1,12 @@ | |||
1 | { | ||
2 | "extends": "./tsconfig.build.json", | ||
3 | "compilerOptions": { | ||
4 | "composite": false, | ||
5 | "emitDeclarationOnly": false, | ||
6 | "declarationDir": null, | ||
7 | "noEmit": true, | ||
8 | "rootDir": null, | ||
9 | "types": ["@types/jest", "node"] | ||
10 | }, | ||
11 | "include": ["src/**/*.ts", ".eslintrc.cjs"] | ||
12 | } | ||