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

chore(jest-cli): standardize files and folder names #10698

Merged
merged 2 commits into from
Oct 25, 2020
Merged

chore(jest-cli): standardize files and folder names #10698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4585f64
chore(jest-cli): standardize files and folder names
snitin315 Oct 25, 2020
7134a10
add changelog entry
snitin315 Oct 25, 2020
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Chore & Maintenance

- `[jest-cli]` chore: standardize files and folder names ([#10698](https://github.com/facebook/jest/pull/1098))

### Performance

## 26.6.1
Expand Down
0 ...pshots__/modify_package_json.test.ts.snap → ...napshots__/modifyPackageJson.test.ts.snap
View file
Open in desktop
File renamed without changes.
0 .../has_jest_config_file_cjs/jest.config.cjs → .../has-jest-config-file-cjs/jest.config.cjs
View file
Open in desktop
File renamed without changes.
0 ...res/has_jest_config_file_cjs/package.json → ...res/has-jest-config-file-cjs/package.json
View file
Open in desktop
File renamed without changes.
0 ...es/has_jest_config_file_js/jest.config.js → ...es/has-jest-config-file-js/jest.config.js
View file
Open in desktop
File renamed without changes.
0 ...ures/has_jest_config_file_js/package.json → ...ures/has-jest-config-file-js/package.json
View file
Open in desktop
File renamed without changes.
0 ...as_jest_config_file_json/jest.config.json → ...as-jest-config-file-json/jest.config.json
View file
Open in desktop
File renamed without changes.
0 ...es/has_jest_config_file_json/package.json → ...es/has-jest-config-file-json/package.json
View file
Open in desktop
File renamed without changes.
0 .../has_jest_config_file_mjs/jest.config.mjs → .../has-jest-config-file-mjs/jest.config.mjs
View file
Open in desktop
File renamed without changes.
0 ...res/has_jest_config_file_mjs/package.json → ...res/has-jest-config-file-mjs/package.json
View file
Open in desktop
File renamed without changes.
0 ...es/has_jest_config_file_ts/jest.config.ts → ...es/has-jest-config-file-ts/jest.config.ts
View file
Open in desktop
File renamed without changes.
0 ...ures/has_jest_config_file_ts/package.json → ...ures/has-jest-config-file-ts/package.json
View file
Open in desktop
File renamed without changes.
0 ..._jest_config_in_package_json/package.json → ...-jest-config-in-package-json/package.json
View file
Open in desktop
File renamed without changes.
0 ...tests__/fixtures/no_package_json/index.js → ...tests__/fixtures/no-package-json/index.js
View file
Open in desktop
File renamed without changes.
0 ..._/fixtures/only_package_json/package.json → ..._/fixtures/only-package-json/package.json
View file
Open in desktop
File renamed without changes.
0 ...est_generated_jest_config_ts/package.json → ...est-generated-jest-config-ts/package.json
View file
Open in desktop
File renamed without changes.
0 ...tures/test_script_configured/package.json → ...tures/test-script-configured/package.json
View file
Open in desktop
File renamed without changes.
0 ...tests__/fixtures/type_module/package.json → ...tests__/fixtures/type-module/package.json
View file
Open in desktop
File renamed without changes.
0 ...s/typescript_in_dependencies/package.json → ...s/typescript-in-dependencies/package.json
View file
Open in desktop
File renamed without changes.
0 ...pescript_in_dev_dependencies/package.json → ...pescript-in-dev-dependencies/package.json
View file
Open in desktop
File renamed without changes.
32 changes: 16 additions & 16 deletions packages/jest-cli/src/init/__tests__/init.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ describe('init', () => {
it('should return the default configuration (an empty config)', async () => {
prompts.mockReturnValueOnce({});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];

Expand All @@ -58,7 +58,7 @@ describe('init', () => {
it('should generate empty config with mjs extension', async () => {
prompts.mockReturnValueOnce({});

await init(resolveFromFixture('type_module'));
await init(resolveFromFixture('type-module'));

const writtenJestConfigFilename = fs.writeFileSync.mock.calls[0][0];
const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
Expand All @@ -74,7 +74,7 @@ describe('init', () => {
it('should create configuration for {clearMocks: true}', async () => {
prompts.mockReturnValueOnce({clearMocks: true});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
const evaluatedConfig = eval(writtenJestConfig);
Expand All @@ -85,7 +85,7 @@ describe('init', () => {
it('should create configuration for {coverage: true}', async () => {
prompts.mockReturnValueOnce({coverage: true});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
const evaluatedConfig = eval(writtenJestConfig);
Expand All @@ -96,7 +96,7 @@ describe('init', () => {
it('should create configuration for {coverageProvider: "babel"}', async () => {
prompts.mockReturnValueOnce({coverageProvider: 'babel'});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
const evaluatedConfig = eval(writtenJestConfig);
Expand All @@ -107,7 +107,7 @@ describe('init', () => {
it('should create configuration for {coverageProvider: "v8"}', async () => {
prompts.mockReturnValueOnce({coverageProvider: 'v8'});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
const evaluatedConfig = eval(writtenJestConfig);
Expand All @@ -118,7 +118,7 @@ describe('init', () => {
it('should create configuration for {environment: "jsdom"}', async () => {
prompts.mockReturnValueOnce({environment: 'jsdom'});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
const evaluatedConfig = eval(writtenJestConfig);
Expand All @@ -129,7 +129,7 @@ describe('init', () => {
it('should create configuration for {environment: "node"}', async () => {
prompts.mockReturnValueOnce({environment: 'node'});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenJestConfig = fs.writeFileSync.mock.calls[0][1];
const evaluatedConfig = eval(writtenJestConfig);
Expand All @@ -140,7 +140,7 @@ describe('init', () => {
it('should create package.json with configured test command when {scripts: true}', async () => {
prompts.mockReturnValueOnce({scripts: true});

await init(resolveFromFixture('only_package_json'));
await init(resolveFromFixture('only-package-json'));

const writtenPackageJson = fs.writeFileSync.mock.calls[0][1];

Expand All @@ -155,7 +155,7 @@ describe('init', () => {
expect.assertions(1);

try {
await init(resolveFromFixture('no_package_json'));
await init(resolveFromFixture('no-package-json'));
} catch (error) {
expect(error.message).toMatch(
'Could not find a "package.json" file in',
Expand All @@ -171,7 +171,7 @@ describe('init', () => {
it('user answered with "Yes"', async () => {
prompts.mockReturnValueOnce({continue: true}).mockReturnValueOnce({});

await init(resolveFromFixture(`has_jest_config_file_${extension}`));
await init(resolveFromFixture(`has-jest-config-file-${extension}`));

expect(prompts.mock.calls[0][0]).toMatchSnapshot();

Expand All @@ -185,7 +185,7 @@ describe('init', () => {
it('user answered with "No"', async () => {
prompts.mockReturnValueOnce({continue: false});

await init(resolveFromFixture(`has_jest_config_file_${extension}`));
await init(resolveFromFixture(`has-jest-config-file-${extension}`));
// return after first prompt
expect(prompts).toHaveBeenCalledTimes(1);
});
Expand All @@ -198,7 +198,7 @@ describe('init', () => {
it('user answered with "Yes"', async () => {
prompts.mockReturnValueOnce({useTypescript: true});

await init(resolveFromFixture('test_generated_jest_config_ts'));
await init(resolveFromFixture('test-generated-jest-config-ts'));

expect(prompts.mock.calls[0][0]).toMatchSnapshot();

Expand All @@ -212,7 +212,7 @@ describe('init', () => {
it('user answered with "No"', async () => {
prompts.mockReturnValueOnce({useTypescript: false});

await init(resolveFromFixture('test_generated_jest_config_ts'));
await init(resolveFromFixture('test-generated-jest-config-ts'));

const jestConfigFileName = fs.writeFileSync.mock.calls[0][0];

Expand All @@ -225,7 +225,7 @@ describe('init', () => {
it('should ask the user whether to override config or not', async () => {
prompts.mockReturnValueOnce({continue: true}).mockReturnValueOnce({});

await init(resolveFromFixture('has_jest_config_in_package_json'));
await init(resolveFromFixture('has-jest-config-in-package-json'));

expect(prompts.mock.calls[0][0]).toMatchSnapshot();

Expand All @@ -239,7 +239,7 @@ describe('init', () => {
it('should not ask "test script question"', async () => {
prompts.mockReturnValueOnce({});

await init(resolveFromFixture('test_script_configured'));
await init(resolveFromFixture('test-script-configured'));

const questionsNames = prompts.mock.calls[0][0].map(
question => question.name,
Expand Down
2 changes: 1 addition & 1 deletion ...nit/__tests__/modify_package_json.test.ts → .../init/__tests__/modifyPackageJson.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import modifyPackageJson from '../modify_package_json';
import modifyPackageJson from '../modifyPackageJson';

test('should remove jest config if exists', () => {
expect(
Expand Down
0 ...jest-cli/src/init/generate_config_file.ts → ...s/jest-cli/src/init/generateConfigFile.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions packages/jest-cli/src/init/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {constants} from 'jest-config';
import {tryRealpath} from 'jest-util';
import defaultQuestions, {testScriptQuestion} from './questions';
import {MalformedPackageJsonError, NotFoundPackageJsonError} from './errors';
import generateConfigFile from './generate_config_file';
import modifyPackageJson from './modify_package_json';
import generateConfigFile from './generateConfigFile';
import modifyPackageJson from './modifyPackageJson';
import type {ProjectPackageJson} from './types';

const {
Expand Down
0 .../jest-cli/src/init/modify_package_json.ts → ...es/jest-cli/src/init/modifyPackageJson.ts
View file
Open in desktop
File renamed without changes.