Skip to content

Commit 2ecf723

Browse files
authored
refactor(jest-cli): reduce nesting in the package (#13395)
1 parent dfda079 commit 2ecf723

File tree

24 files changed

+6
-9
lines changed

24 files changed

+6
-9
lines changed

jest.config.mjs

+1-4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ export default {
3939
testPathIgnorePatterns: [
4040
'/__arbitraries__/',
4141
'/__benchmarks__/',
42+
'/__fixtures__/',
4243
'/__typetests__/',
4344
'/node_modules/',
4445
'/examples/',
@@ -53,20 +54,16 @@ export default {
5354
'/packages/.*/build',
5455
'/packages/.*/src/__tests__/setPrettyPrint.ts',
5556
'/packages/jest-core/src/__tests__/test_root',
56-
'/packages/jest-core/src/__tests__/__fixtures__/',
57-
'/packages/jest-cli/src/init/__tests__/fixtures/',
5857
'/packages/jest-haste-map/src/__tests__/haste_impl.js',
5958
'/packages/jest-haste-map/src/__tests__/dependencyExtractor.js',
6059
'/packages/jest-haste-map/src/__tests__/test_dotfiles_root/',
6160
'/packages/jest-repl/src/__tests__/test_root',
62-
'/packages/jest-resolve-dependencies/src/__tests__/__fixtures__/',
6361
'/packages/jest-runtime/src/__tests__/defaultResolver.js',
6462
'/packages/jest-runtime/src/__tests__/module_dir/',
6563
'/packages/jest-runtime/src/__tests__/NODE_PATH_dir',
6664
'/packages/jest-snapshot/src/__tests__/plugins',
6765
'/packages/jest-snapshot/src/__tests__/fixtures/',
6866
'/packages/jest-validate/src/__tests__/fixtures/',
69-
'/packages/jest-worker/src/workers/__tests__/__fixtures__/',
7067
'/e2e/__tests__/iterator-to-null-test.ts',
7168
'/e2e/__tests__/tsIntegration.test.ts', // this test needs types to be build, it runs in a separate CI job through `jest.config.ts.mjs`
7269
],

packages/jest-cli/src/__tests__/cli/args.test.ts packages/jest-cli/src/__tests__/args.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import type {Config} from '@jest/types';
1010
import {constants} from 'jest-config';
11-
import {buildArgv} from '../../cli';
12-
import {check} from '../../cli/args';
11+
import {check} from '../args';
12+
import {buildArgv} from '../run';
1313

1414
const argv = (input: Partial<Config.Argv>): Config.Argv => input as Config.Argv;
1515

File renamed without changes.

packages/jest-cli/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
export {run} from './cli';
8+
export {run} from './run';

packages/jest-cli/src/init/__tests__/init.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jest.mock('graceful-fs', () => ({
2929
}));
3030

3131
const resolveFromFixture = (relativePath: string) =>
32-
path.resolve(__dirname, 'fixtures', relativePath);
32+
path.resolve(__dirname, '__fixtures__', relativePath);
3333

3434
const consoleLog = console.log;
3535

packages/jest-cli/src/cli/index.ts packages/jest-cli/src/run.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import type {Config} from '@jest/types';
1515
import {deprecationEntries} from 'jest-config';
1616
import {clearLine, tryRealpath} from 'jest-util';
1717
import {validateCLIOptions} from 'jest-validate';
18-
import init from '../init';
1918
import * as args from './args';
19+
import init from './init';
2020

2121
export async function run(
2222
maybeArgv?: Array<string>,

0 commit comments

Comments
 (0)