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

Standardize File Name #7467

Merged
merged 9 commits into from
Dec 5, 2018
Merged

Standardize File Name #7467

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ab417e
standardizing filenames: jest-backticks to jestBackticks
GGonryun Dec 5, 2018
18a8883
standardizing filenames: mock-file to mock_file
GGonryun Dec 5, 2018
c2833c2
updating changelog
GGonryun Dec 5, 2018
29018c6
updating changelog
GGonryun Dec 5, 2018
05e47ba
standardizing filenames: revising mock_file.js to mockFile.js
GGonryun Dec 5, 2018
21b6e50
adding back .babelrc
GGonryun Dec 5, 2018
762ab5e
updating changelog
GGonryun Dec 5, 2018
ff19567
Update CHANGELOG.md
thymikee Dec 5, 2018
bae77b4
Update .babelrc
GGonryun Dec 5, 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
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
- `[*]` 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]` 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))
- `[docs]` Add `testPathIgnorePatterns` in CLI documentation ([#7440](https://github.com/facebook/jest/pull/7440))
- `[*]` 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) )
GGonryun marked this conversation as resolved.
Show resolved Hide resolved

### Performance

Expand Down
2 changes: 1 addition & 1 deletion e2e/babel-plugin-jest-hoist/.babelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
}
],
"retainLines": true
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the issue I was having here: #7466. i was able to resolve it by removing the file. But I accidentally added this to the last commit it wasn't supposed to be pushed. I meant to ask about adding this separately since it seemed to have resolved the issue for me.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the issue I was having here: #7466. i was able to resolve it by removing the file

I don't experience this under macOS. Probably something Windows related. But generally it should work, maybe you didn't run yarn inside this directory?

Anyway, please add extra newline back :D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit confused as to where to put the newline, I copied the contents back from the original file over to this file from github. 😕

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scratch that! I found it. :)

}
0 ...est_modules__/__mocks__/jest-backticks.js → ...test_modules__/__mocks__/jestBackticks.js
View file
Open in desktop
File renamed without changes.
0 ...-hoist/__test_modules__/jest-backticks.js → ...t-hoist/__test_modules__/jestBackticks.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions e2e/babel-plugin-jest-hoist/__tests__/integration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import b from '../__test_modules__/b';
import c from '../__test_modules__/c';
import d from '../__test_modules__/d';
import e from '../__test_modules__/e';
import jestBackticks from '../__test_modules__/jest-backticks';
import jestBackticks from '../__test_modules__/jestBackticks';

// The virtual mock call below will be hoisted above this `require` call.
const virtualModule = require('virtual-module');
Expand All @@ -45,7 +45,7 @@ jest.mock('../__test_modules__/e', () => {
},
};
});
jest.mock(`../__test_modules__/jest-backticks`);
jest.mock(`../__test_modules__/jestBackticks`);
jest.mock('virtual-module', () => 'kiwi', {virtual: true});
// This has types that should be ignored by the out-of-scope variables check.
jest.mock('has-flow-types', () => (props: {children: mixed}) => 3, {
Expand Down Expand Up @@ -123,7 +123,7 @@ describe('babel-plugin-jest-hoist', () => {
});

it('requires modules that also call jest.mock', () => {
require('../mock-file');
require('../mockFile');
const mock = require('../banana');
expect(mock).toEqual('apple');
});
Expand Down
0 e2e/babel-plugin-jest-hoist/mock-file.js → e2e/babel-plugin-jest-hoist/mockFile.js
View file
Open in desktop
File renamed without changes.