Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@
- `[docs]` Remove duplicate code in `MockFunctions` ([#7297](https://github.com/facebook/jest/pull/7297))
- `[*]` Add check for Facebook copyright headers on CI ([#7370](https://github.com/facebook/jest/pull/7370))
- `[jest-haste-map]` Refactor `dependencyExtractor` and tests ([#7385](https://github.com/facebook/jest/pull/7385))
- `[docs]` Clearify conditional setting of `NODE_ENV` ([#7369](https://github.com/facebook/jest/pull/7369))
Comment thread
thymikee marked this conversation as resolved.
- `[jest-runner]` Standardize filenames ([#7464](https://github.com/facebook/jest/pull/7464))
- `[docs]` Clarify conditional setting of `NODE_ENV` ([#7369](https://github.com/facebook/jest/pull/7369))
- `[*]` Standardize file names ([#7316](https://github.com/facebook/jest/pull/7316), [#7266](https://github.com/facebook/jest/pull/7266), [#7238](https://github.com/facebook/jest/pull/7238), [#7314](https://github.com/facebook/jest/pull/7314), [#7467](https://github.com/facebook/jest/pull/7467))
- `[docs]` Add `testPathIgnorePatterns` in CLI documentation ([#7440](https://github.com/facebook/jest/pull/7440))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jest.mock('jest-worker', () =>
),
);

jest.mock('../test_worker', () => {});
jest.mock('../testWorker', () => {});

test('injects the serializable module map into each worker in watch mode', () => {
const globalConfig = {maxWorkers: 2, watch: true};
Expand Down
6 changes: 3 additions & 3 deletions packages/jest-runner/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import type {
TestWatcher,
} from 'types/TestRunner';

import typeof {worker} from './test_worker';
import typeof {worker} from './testWorker';

import exit from 'exit';
import runTest from './run_test';
import runTest from './runTest';
import throat from 'throat';
import Worker from 'jest-worker';

const TEST_WORKER_PATH = require.resolve('./test_worker');
const TEST_WORKER_PATH = require.resolve('./testWorker');

type WorkerInterface = Worker & {worker: worker};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import exit from 'exit';
import HasteMap from 'jest-haste-map';
import {separateMessageFromStack} from 'jest-message-util';
import Runtime from 'jest-runtime';
import runTest from './run_test';
import runTest from './runTest';

export type WorkerData = {|
config: ProjectConfig,
Expand Down