Skip to content

Commit 47e238b

Browse files
committed
test: split test setup into a separate library
1 parent aec4f10 commit 47e238b

101 files changed

Lines changed: 225 additions & 179 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,32 @@
3434
"type:app",
3535
"type:feature",
3636
"type:util",
37-
"type:testing-util"
37+
"type:testing"
3838
]
3939
},
4040
{
4141
"sourceTag": "type:app",
4242
"onlyDependOnLibsWithTags": [
4343
"type:feature",
4444
"type:util",
45-
"type:testing-util"
45+
"type:testing"
4646
]
4747
},
4848
{
4949
"sourceTag": "type:feature",
5050
"onlyDependOnLibsWithTags": [
5151
"type:feature",
5252
"type:util",
53-
"type:testing-util"
53+
"type:testing"
5454
]
5555
},
5656
{
5757
"sourceTag": "type:util",
58-
"onlyDependOnLibsWithTags": ["type:util", "type:testing-util"]
58+
"onlyDependOnLibsWithTags": ["type:util", "type:testing"]
5959
},
6060
{
61-
"sourceTag": "type:testing-util",
62-
"onlyDependOnLibsWithTags": ["type:util"]
61+
"sourceTag": "type:testing",
62+
"onlyDependOnLibsWithTags": ["type:util", "type:testing"]
6363
}
6464
]
6565
}

.github/labeler.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,9 @@
3636
- '**/*.test.ts'
3737
- '**/mocks/**'
3838
- e2e/**
39-
- testing-utils/**
39+
- testing/**
4040
- '**/vitest.config*.ts'
4141
- 'vitest.workspace.ts'
42-
- 'global-setup*.ts'
43-
- '.verdaccio/config.yml'
4442

4543
🦾 CI/CD:
4644
- changed-files:
@@ -65,3 +63,4 @@
6563
- '.github/ISSUE_TEMPLATE/**'
6664
- '.husky/**'
6765
- 'commitlint.config.js'
66+
- '.verdaccio/config.yml'

e2e/cli-e2e/tests/collect.e2e.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { dirname, join } from 'node:path';
22
import { fileURLToPath } from 'node:url';
33
import { PluginReport, Report, reportSchema } from '@code-pushup/models';
4-
import { cleanTestFolder } from '@code-pushup/testing-utils';
4+
import { cleanTestFolder } from '@code-pushup/test-setup';
55
import { executeProcess, readJsonFile, readTextFile } from '@code-pushup/utils';
66

77
describe('CLI collect', () => {

e2e/cli-e2e/vite.config.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export default defineConfig({
1414
environment: 'node',
1515
include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
1616
globalSetup: ['global-setup.e2e.ts'],
17-
setupFiles: ['../../testing-utils/src/lib/setup/reset.mocks.ts'],
17+
setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
1818
},
1919
});

esbuild.config.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ const { execSync } = require('child_process');
33
const { readFileSync, writeFileSync, existsSync } = require('fs');
44

55
const project = process.env.NX_TASK_TARGET_PROJECT;
6-
const projectPath =
7-
project === 'testing-utils'
8-
? 'testing-utils'
9-
: project === 'examples-plugins'
10-
? 'examples/plugins'
11-
: `packages/${project}`;
6+
const projectPath = project.startsWith('test-')
7+
? `testing/${project}`
8+
: project === 'examples-plugins'
9+
? 'examples/plugins'
10+
: `packages/${project}`;
1211

1312
esbuild.build({
1413
plugins: [

examples/plugins/src/file-size/src/file-size.plugin.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
categoryRefSchema,
77
pluginConfigSchema,
88
} from '@code-pushup/models';
9-
import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
9+
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
1010
import {
1111
PluginOptions,
1212
audits,

examples/plugins/src/lighthouse/src/lighthouse.plugin.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
categoryRefSchema,
77
pluginConfigSchema,
88
} from '@code-pushup/models';
9-
import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
9+
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
1010
import { LIGHTHOUSE_URL } from '../mock/constants';
1111
import { lhr } from '../mock/fixtures/lhr';
1212
import { LIGHTHOUSE_OUTPUT_FILE_DEFAULT, corePerfGroupRefs } from './constants';

examples/plugins/src/package-json/src/package-json.plugin.integration.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
pluginConfigSchema,
88
pluginReportSchema,
99
} from '@code-pushup/models';
10-
import { MEMFS_VOLUME } from '@code-pushup/testing-utils';
10+
import { MEMFS_VOLUME } from '@code-pushup/test-utils';
1111
import { audits, pluginSlug as slug } from './constants';
1212
import { PluginOptions, create } from './package-json.plugin';
1313
import {

examples/plugins/vite.config.integration.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ export default defineConfig({
1717
include: ['src/**/*.integration.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
1818
globalSetup: ['global-setup.ts'],
1919
setupFiles: [
20-
'../../testing-utils/src/lib/setup/fs.mock.ts',
21-
'../../testing-utils/src/lib/setup/git.mock.ts',
22-
'../../testing-utils/src/lib/setup/console.mock.ts',
23-
'../../testing-utils/src/lib/setup/reset.mocks.ts',
20+
'../../testing/test-setup/src/lib/fs.mock.ts',
21+
'../../testing/test-setup/src/lib/git.mock.ts',
22+
'../../testing/test-setup/src/lib/console.mock.ts',
23+
'../../testing/test-setup/src/lib/reset.mocks.ts',
2424
],
2525
},
2626
});

examples/plugins/vite.config.unit.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ export default defineConfig({
1717
include: ['src/**/*.unit.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
1818
globalSetup: ['global-setup.ts'],
1919
setupFiles: [
20-
'../../testing-utils/src/lib/setup/fs.mock.ts',
21-
'../../testing-utils/src/lib/setup/git.mock.ts',
22-
'../../testing-utils/src/lib/setup/console.mock.ts',
23-
'../../testing-utils/src/lib/setup/reset.mocks.ts',
20+
'../../testing/test-setup/src/lib/fs.mock.ts',
21+
'../../testing/test-setup/src/lib/git.mock.ts',
22+
'../../testing/test-setup/src/lib/console.mock.ts',
23+
'../../testing/test-setup/src/lib/reset.mocks.ts',
2424
],
2525
},
2626
});

0 commit comments

Comments
 (0)