Skip to content

Commit bbd1d10

Browse files
author
Szymon.Poltorak
committed
refactor: clean up mock and setup-file files
1 parent 13ca5f2 commit bbd1d10

File tree

11 files changed

+30
-29
lines changed

11 files changed

+30
-29
lines changed

eslint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ export default tseslint.config(
139139
{
140140
ignores: [
141141
'**/*.mock.*',
142+
'**/*.setup-file.*',
142143
'**/code-pushup.config.ts',
143144
'**/mocks/fixtures/**',
144145
'**/__snapshots__/**',

packages/plugin-lighthouse/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To test lighthouse properly we work with a predefined testing setup.
1515

1616
On some OS there could be a problem finding the path to Chrome.
1717

18-
We try to detect it automatically in the [`chrome-path.mock.ts` script](../../testing/test-setup/src/lib/chrome-path.mock.ts).
18+
We try to detect it automatically in the [`chrome-path.setup-file.ts` script](../../testing/test-setup/src/lib/chrome-path.setup-file.ts).
1919
There we use `getChromePath` and have `chromium` installed as NPM package, so detecting the path should not cause any problem.
2020

2121
However, if no chrome path is detected automatically the error looks like this:
@@ -46,7 +46,7 @@ In the CI you can set a static path if needed over the env variable like this:
4646
# ...
4747
```
4848

49-
We consider this path in our `beforeAll` hook in a [`chrome-path.mock.ts` script](../../testing/test-setup/src/lib/chrome-path.mock.ts).
49+
We consider this path in our `beforeAll` hook in a [`chrome-path.setup-file.ts` script](../../testing/test-setup/src/lib/chrome-path.setup-file.ts).
5050

5151
### Testing chrome flags
5252

testing/test-setup-config/src/lib/vitest-config-factory.unit.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ describe('createVitestConfig', () => {
3232
],
3333
globalSetup: ['../../global-setup.ts'],
3434
setupFiles: expect.arrayContaining([
35-
'../../testing/test-setup/src/lib/reset.mock.ts',
36-
'../../testing/test-setup/src/lib/fs.mock.ts',
35+
'../../testing/test-setup/src/lib/reset.setup-file.ts',
36+
'../../testing/test-setup/src/lib/fs.setup-file.ts',
3737
]),
3838
coverage: expect.objectContaining({
3939
reporter: ['text', 'lcov'],
@@ -70,19 +70,19 @@ describe('createVitestConfig', () => {
7070

7171
const setupFiles = config.test!.setupFiles;
7272
expect(setupFiles).toContain(
73-
'../../testing/test-setup/src/lib/reset.mock.ts',
73+
'../../testing/test-setup/src/lib/reset.setup-file.ts',
7474
);
7575
expect(setupFiles).toContain(
76-
'../../testing/test-setup/src/lib/fs.mock.ts',
76+
'../../testing/test-setup/src/lib/fs.setup-file.ts',
7777
);
7878
expect(setupFiles).toContain(
79-
'../../testing/test-setup/src/lib/git.mock.ts',
79+
'../../testing/test-setup/src/lib/git.setup-file.ts',
8080
);
8181
expect(setupFiles).toContain(
82-
'../../testing/test-setup/src/lib/portal-client.mock.ts',
82+
'../../testing/test-setup/src/lib/portal-client.setup-file.ts',
8383
);
8484
expect(setupFiles).toContain(
85-
'../../testing/test-setup/src/lib/logger.mock.ts',
85+
'../../testing/test-setup/src/lib/logger.setup-file.ts',
8686
);
8787
expect(setupFiles).toContain(
8888
'../../testing/test-setup/src/lib/extend/markdown-table.matcher.ts',
@@ -141,16 +141,16 @@ describe('createVitestConfig', () => {
141141

142142
const setupFiles = config.test!.setupFiles;
143143
expect(setupFiles).toContain(
144-
'../../testing/test-setup/src/lib/logger.mock.ts',
144+
'../../testing/test-setup/src/lib/logger.setup-file.ts',
145145
);
146146
expect(setupFiles).not.toContain(
147-
'../../testing/test-setup/src/lib/fs.mock.ts',
147+
'../../testing/test-setup/src/lib/fs.setup-file.ts',
148148
);
149149
expect(setupFiles).not.toContain(
150-
'../../testing/test-setup/src/lib/cliui.mock.ts',
150+
'../../testing/test-setup/src/lib/cliui.setup-file.ts',
151151
);
152152
expect(setupFiles).not.toContain(
153-
'../../testing/test-setup/src/lib/git.mock.ts',
153+
'../../testing/test-setup/src/lib/git.setup-file.ts',
154154
);
155155
expect(setupFiles).toContain(
156156
'../../testing/test-setup/src/lib/extend/path.matcher.ts',
@@ -186,14 +186,14 @@ describe('createVitestConfig', () => {
186186
const setupFiles = config.test!.setupFiles;
187187
// Should only include reset mocks
188188
expect(setupFiles).toContain(
189-
'../../testing/test-setup/src/lib/reset.mock.ts',
189+
'../../testing/test-setup/src/lib/reset.setup-file.ts',
190190
);
191191
// Should NOT include fs, git, etc.
192192
expect(setupFiles).not.toContain(
193-
'../../testing/test-setup/src/lib/git.mock.ts',
193+
'../../testing/test-setup/src/lib/git.setup-file.ts',
194194
);
195195
expect(setupFiles).not.toContain(
196-
'../../testing/test-setup/src/lib/fs.mock.ts',
196+
'../../testing/test-setup/src/lib/fs.setup-file.ts',
197197
);
198198
// Should include all matchers
199199
expect(setupFiles).toContain(

testing/test-setup-config/src/lib/vitest-setup-files.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ const CUSTOM_MATCHERS = [
2020
* which is why they use `../../` to navigate to the workspace root first.
2121
*/
2222
const UNIT_TEST_SETUP_FILES = [
23-
'../../testing/test-setup/src/lib/reset.mock.ts',
24-
'../../testing/test-setup/src/lib/fs.mock.ts',
25-
'../../testing/test-setup/src/lib/logger.mock.ts',
26-
'../../testing/test-setup/src/lib/git.mock.ts',
23+
'../../testing/test-setup/src/lib/reset.setup-file.ts',
24+
'../../testing/test-setup/src/lib/fs.setup-file.ts',
25+
'../../testing/test-setup/src/lib/logger.setup-file.ts',
26+
'../../testing/test-setup/src/lib/git.setup-file.ts',
2727
'../../testing/test-setup/src/lib/performance.setup-file.ts',
28-
'../../testing/test-setup/src/lib/portal-client.mock.ts',
28+
'../../testing/test-setup/src/lib/portal-client.setup-file.ts',
2929
'../../testing/test-setup/src/lib/process.setup-file.ts',
3030
...CUSTOM_MATCHERS,
3131
] as const;
@@ -38,9 +38,9 @@ const UNIT_TEST_SETUP_FILES = [
3838
3939
*/
4040
const INT_TEST_SETUP_FILES = [
41-
'../../testing/test-setup/src/lib/reset.mock.ts',
42-
'../../testing/test-setup/src/lib/logger.mock.ts',
43-
'../../testing/test-setup/src/lib/chrome-path.mock.ts',
41+
'../../testing/test-setup/src/lib/reset.setup-file.ts',
42+
'../../testing/test-setup/src/lib/logger.setup-file.ts',
43+
'../../testing/test-setup/src/lib/chrome-path.setup-file.ts',
4444
...CUSTOM_MATCHERS,
4545
] as const;
4646

@@ -51,7 +51,7 @@ const INT_TEST_SETUP_FILES = [
5151
* which is why they use `../../` to navigate to the workspace root first.
5252
*/
5353
const E2E_TEST_SETUP_FILES = [
54-
'../../testing/test-setup/src/lib/reset.mock.ts',
54+
'../../testing/test-setup/src/lib/reset.setup-file.ts',
5555
...CUSTOM_MATCHERS,
5656
] as const;
5757

testing/test-setup/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ See [`@code-pushup/test-setup-config` docs](../test-setup-config/README.md) on h
1313
In this library you can find all files that can be used in `setupFiles` property of `vitest.config.(unit|int|e2e).ts` files. Currently include:
1414

1515
- [console](./src/lib/console.mock.ts) mocking
16-
- [file system](./src/lib/fs.mock.ts) mocking
17-
- [`portal-client`](./src/lib/portal-client.mock.ts) mocking
18-
- [git](./src/lib/git.mock.ts) mocking
16+
- [file system](./src/lib/fs.setup-file.ts) mocking
17+
- [`portal-client`](./src/lib/portal-client.setup-file.ts) mocking
18+
- [git](./src/lib/git.setup-file.ts) mocking
1919

2020
Additionally, you may find helper functions for:
2121

2222
- setting up and tearing down a [testing folder](./src/lib/test-folder.setup.ts)
23-
- [resetting](./src/lib/reset.mock.ts) mocks
23+
- [resetting](./src/lib/reset.setup-file.ts) mocks
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)