Skip to content

Commit 7c398db

Browse files
Michael Baldwincpojer
Michael Baldwin
authored andcommitted
Standardize file names: Fix file names in root (jestjs#5500)
* standardize file names in root * Update CHANGELOG
1 parent 3942361 commit 7c398db

File tree

10 files changed

+14
-10
lines changed

10 files changed

+14
-10
lines changed

.eslintrc.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
const path = require('path');
9-
const customImportResolver = path.resolve('./eslint_import_resolver');
9+
const customImportResolver = path.resolve('./eslintImportResolver');
1010

1111
module.exports = {
1212
extends: [
@@ -89,7 +89,7 @@ module.exports = {
8989
'scripts/**/*',
9090
'integration-tests/*/**/*',
9191
'website/*/**/*',
92-
'eslint_import_resolver.js',
92+
'eslintImportResolver.js',
9393
],
9494
rules: {
9595
'prettier/prettier': [
@@ -150,8 +150,8 @@ module.exports = {
150150
'**/__mocks__/**',
151151
'**/?(*.)(spec|test).js?(x)',
152152
'scripts/**',
153-
'eslint_import_resolver.js',
154-
'test_setup_file.js',
153+
'eslintImportResolver.js',
154+
'testSetupFile.js',
155155
],
156156
},
157157
],
@@ -168,7 +168,7 @@ module.exports = {
168168
trailingComma: 'all',
169169
},
170170
],
171-
'unicorn/filename-case': [2, {case: 'snakeCase'}],
171+
'unicorn/filename-case': [1, {case: 'snakeCase'}],
172172
},
173173
settings: {
174174
'import/resolver': {

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
process. It will be available via `process.env.JEST_WORKER_ID`
1212
([#5494](https://github.com/facebook/jest/pull/5494))
1313

14+
### Chore & Maintenance
15+
* `[filenames]` Standardize file names in root ([#5500](https://github.com/facebook/jest/pull/5500))
16+
17+
1418
## jest 22.2.1
1519

1620
### Fixes
File renamed without changes.
File renamed without changes.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"transform": {
133133
"^.+\\.js$": "<rootDir>/packages/babel-jest"
134134
},
135-
"setupTestFrameworkScriptFile": "<rootDir>/test_setup_file.js",
135+
"setupTestFrameworkScriptFile": "<rootDir>/testSetupFile.js",
136136
"snapshotSerializers": [
137137
"<rootDir>/packages/pretty-format/build/plugins/convert_ansi.js"
138138
],

packages/jest-cli/src/__tests__/generate_empty_coverage.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import generateEmptyCoverage from '../generate_empty_coverage';
1212

1313
const os = require('os');
14-
const {makeGlobalConfig, makeProjectConfig} = require('../../../../test_utils');
14+
const {makeGlobalConfig, makeProjectConfig} = require('../../../../TestUtils');
1515

1616
jest.mock('jest-runtime', () => {
1717
// $FlowFixMe requireActual

packages/jest-cli/src/lib/__tests__/is_valid_path.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const path = require('path');
1313
const {
1414
makeGlobalConfig,
1515
makeProjectConfig,
16-
} = require('../../../../../test_utils');
16+
} = require('../../../../../TestUtils');
1717

1818
const rootDir = path.resolve(path.sep, 'root');
1919

packages/jest-config/src/valid_config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export default ({
7979
runTestsByPath: false,
8080
runner: 'jest-runner',
8181
setupFiles: ['<rootDir>/setup.js'],
82-
setupTestFrameworkScriptFile: '<rootDir>/test_setup_file.js',
82+
setupTestFrameworkScriptFile: '<rootDir>/testSetupFile.js',
8383
silent: true,
8484
skipNodeResolution: false,
8585
snapshotSerializers: ['my-serializer-module'],

packages/jest-validate/src/__tests__/fixtures/jest_config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const validConfig = {
105105
rootDir: '/',
106106
roots: ['<rootDir>'],
107107
setupFiles: ['<rootDir>/setup.js'],
108-
setupTestFrameworkScriptFile: '<rootDir>/test_setup_file.js',
108+
setupTestFrameworkScriptFile: '<rootDir>/testSetupFile.js',
109109
silent: true,
110110
snapshotSerializers: ['my-serializer-module'],
111111
testEnvironment: 'jest-environment-jsdom',
File renamed without changes.

0 commit comments

Comments
 (0)