Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue4969: Standardize filenames: jest-runner pkg #7464

Merged
merged 6 commits into from
Dec 7, 2018
Merged

Issue4969: Standardize filenames: jest-runner pkg #7464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa116bd
renamed 'run_test.js' to 'runTest.js' and updated imports
betalantz Dec 4, 2018
5b53f91
renamed 'test_worker.js' to 'testWorker.js' and updated imports
betalantz Dec 4, 2018
ab492a1
added PR to CHANGELOG
betalantz Dec 4, 2018
b2f58b3
renamed test_runner.test.js to testRunner.test.js
betalantz Dec 4, 2018
3271f43
Resolved conflicts in Changelog.md
betalantz Dec 5, 2018
b09324b
Consolidated this PR to generic point with other file renames
betalantz Dec 6, 2018
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@
- `[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))
thymikee marked this conversation as resolved.
Show resolved Hide resolved
- `[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))
- `[*]` 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), [#7464](https://github.com/facebook/jest/pull/7464))
- `[docs]` Add `testPathIgnorePatterns` in CLI documentation ([#7440](https://github.com/facebook/jest/pull/7440))

### Performance
Expand Down
2 changes: 1 addition & 1 deletion ...-runner/src/__tests__/test_runner.test.js → ...t-runner/src/__tests__/testRunner.test.js
View file
Open in desktop
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
View file
Open in desktop
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
0 packages/jest-runner/src/run_test.js → packages/jest-runner/src/runTest.js
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/jest-runner/src/test_worker.js → packages/jest-runner/src/testWorker.js
View file
Open in desktop
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