Skip to content

Commit

Permalink
Standardize file names: Fix file names in root (#5500)
Browse files Browse the repository at this point in the history
* standardize file names in root

* Update CHANGELOG
  • Loading branch information
Michael Baldwin authored and cpojer committed Feb 9, 2018
1 parent 3942361 commit 7c398db
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

const path = require('path');
const customImportResolver = path.resolve('./eslint_import_resolver');
const customImportResolver = path.resolve('./eslintImportResolver');

module.exports = {
extends: [
Expand Down Expand Up @@ -89,7 +89,7 @@ module.exports = {
'scripts/**/*',
'integration-tests/*/**/*',
'website/*/**/*',
'eslint_import_resolver.js',
'eslintImportResolver.js',
],
rules: {
'prettier/prettier': [
Expand Down Expand Up @@ -150,8 +150,8 @@ module.exports = {
'**/__mocks__/**',
'**/?(*.)(spec|test).js?(x)',
'scripts/**',
'eslint_import_resolver.js',
'test_setup_file.js',
'eslintImportResolver.js',
'testSetupFile.js',
],
},
],
Expand All @@ -168,7 +168,7 @@ module.exports = {
trailingComma: 'all',
},
],
'unicorn/filename-case': [2, {case: 'snakeCase'}],
'unicorn/filename-case': [1, {case: 'snakeCase'}],
},
settings: {
'import/resolver': {
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
process. It will be available via `process.env.JEST_WORKER_ID`
([#5494](https://github.com/facebook/jest/pull/5494))

### Chore & Maintenance
* `[filenames]` Standardize file names in root ([#5500](https://github.com/facebook/jest/pull/5500))


## jest 22.2.1

### Fixes
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
"transform": {
"^.+\\.js$": "<rootDir>/packages/babel-jest"
},
"setupTestFrameworkScriptFile": "<rootDir>/test_setup_file.js",
"setupTestFrameworkScriptFile": "<rootDir>/testSetupFile.js",
"snapshotSerializers": [
"<rootDir>/packages/pretty-format/build/plugins/convert_ansi.js"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import generateEmptyCoverage from '../generate_empty_coverage';

const os = require('os');
const {makeGlobalConfig, makeProjectConfig} = require('../../../../test_utils');
const {makeGlobalConfig, makeProjectConfig} = require('../../../../TestUtils');

jest.mock('jest-runtime', () => {
// $FlowFixMe requireActual
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-cli/src/lib/__tests__/is_valid_path.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const path = require('path');
const {
makeGlobalConfig,
makeProjectConfig,
} = require('../../../../../test_utils');
} = require('../../../../../TestUtils');

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

Expand Down
2 changes: 1 addition & 1 deletion packages/jest-config/src/valid_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default ({
runTestsByPath: false,
runner: 'jest-runner',
setupFiles: ['<rootDir>/setup.js'],
setupTestFrameworkScriptFile: '<rootDir>/test_setup_file.js',
setupTestFrameworkScriptFile: '<rootDir>/testSetupFile.js',
silent: true,
skipNodeResolution: false,
snapshotSerializers: ['my-serializer-module'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const validConfig = {
rootDir: '/',
roots: ['<rootDir>'],
setupFiles: ['<rootDir>/setup.js'],
setupTestFrameworkScriptFile: '<rootDir>/test_setup_file.js',
setupTestFrameworkScriptFile: '<rootDir>/testSetupFile.js',
silent: true,
snapshotSerializers: ['my-serializer-module'],
testEnvironment: 'jest-environment-jsdom',
Expand Down
File renamed without changes.

0 comments on commit 7c398db

Please sign in to comment.