Skip to content

Commit fa7b6bb

Browse files
author
Szymon.Poltorak
committed
refactor: unify mock name
1 parent 961e2d8 commit fa7b6bb

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

nx.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"!{projectRoot}/code-pushup.config.bundled_*.mjs",
1717
"!{projectRoot}/@(test|mocks)/**/*",
1818
"!{projectRoot}/**/?(*.)test.[jt]s?(x)?(.snap)",
19-
"!{projectRoot}/**/?(*.)mocks.[jt]s?(x)",
2019
"!{projectRoot}/**/?(*.)mock.[jt]s?(x)",
2120
"!{projectRoot}/vitest.@(unit|int|e2e).config.[jt]s",
2221
"!{projectRoot}/dist/**/*",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('createVitestConfig', () => {
3232
],
3333
globalSetup: ['../../global-setup.ts'],
3434
setupFiles: expect.arrayContaining([
35-
'../../testing/test-setup/src/lib/reset.mocks.ts',
35+
'../../testing/test-setup/src/lib/reset.mock.ts',
3636
'../../testing/test-setup/src/lib/fs.mock.ts',
3737
]),
3838
coverage: expect.objectContaining({
@@ -50,7 +50,7 @@ describe('createVitestConfig', () => {
5050

5151
const setupFiles = config.test!.setupFiles;
5252
expect(setupFiles).toContain(
53-
'../../testing/test-setup/src/lib/reset.mocks.ts',
53+
'../../testing/test-setup/src/lib/reset.mock.ts',
5454
);
5555
expect(setupFiles).toContain(
5656
'../../testing/test-setup/src/lib/fs.mock.ts',
@@ -166,7 +166,7 @@ describe('createVitestConfig', () => {
166166
const setupFiles = config.test!.setupFiles;
167167
// Should only include reset mocks
168168
expect(setupFiles).toContain(
169-
'../../testing/test-setup/src/lib/reset.mocks.ts',
169+
'../../testing/test-setup/src/lib/reset.mock.ts',
170170
);
171171
// Should NOT include fs, git, etc.
172172
expect(setupFiles).not.toContain(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ 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.mocks.ts',
23+
'../../testing/test-setup/src/lib/reset.mock.ts',
2424
'../../testing/test-setup/src/lib/fs.mock.ts',
2525
'../../testing/test-setup/src/lib/logger.mock.ts',
2626
'../../testing/test-setup/src/lib/git.mock.ts',
@@ -36,7 +36,7 @@ const UNIT_TEST_SETUP_FILES = [
3636
3737
*/
3838
const INT_TEST_SETUP_FILES = [
39-
'../../testing/test-setup/src/lib/reset.mocks.ts',
39+
'../../testing/test-setup/src/lib/reset.mock.ts',
4040
'../../testing/test-setup/src/lib/logger.mock.ts',
4141
'../../testing/test-setup/src/lib/chrome-path.mock.ts',
4242
...CUSTOM_MATCHERS,
@@ -49,7 +49,7 @@ const INT_TEST_SETUP_FILES = [
4949
* which is why they use `../../` to navigate to the workspace root first.
5050
*/
5151
const E2E_TEST_SETUP_FILES = [
52-
'../../testing/test-setup/src/lib/reset.mocks.ts',
52+
'../../testing/test-setup/src/lib/reset.mock.ts',
5353
...CUSTOM_MATCHERS,
5454
] as const;
5555

testing/test-setup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ In this library you can find all files that can be used in `setupFiles` property
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.mocks.ts) mocks
23+
- [resetting](./src/lib/reset.mock.ts) mocks

0 commit comments

Comments
 (0)