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

Upgrade ESLint to 6 #236

Merged
merged 7 commits into from May 21, 2020
Merged

Upgrade ESLint to 6 #236

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c61b5f
Upgrade ESLint
Aug 19, 2019
0d6b33f
Adjust test
Aug 19, 2019
13a4556
Spy mock instead of re-implementing another mock
kylemh Sep 22, 2019
c1d70a6
Remove call count assertion from test
Sep 24, 2019
acaa3b5
Upgrade to eslint@6.4.0
Sep 24, 2019
95169c5
Merge branch 'master' into upgrade-eslint-to-6
kylemh May 21, 2020
62f85fb
Merge branch 'master' into upgrade-eslint-to-6
hamzahamidi May 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -22,7 +22,7 @@
"common-tags": "^1.4.0",
"core-js": "^3.1.4",
"dlv": "^1.1.0",
"eslint": "^5.0.0",
"eslint": "^6.4.0",
"indent-string": "^4.0.0",
"lodash.merge": "^4.6.0",
"loglevel-colored-level-prefix": "^1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions src/__tests__/index.js
View file
Open in desktop
Expand Up @@ -349,12 +349,12 @@ test('resolves to the local eslint module', () => {
});

test('reads text from fs if filePath is provided but not text', () => {
const readFileSyncMockSpy = jest.spyOn(fsMock, 'readFileSync');

const filePath = '/blah-blah/some-file.js';
format({ filePath });
// format({filePath}).catch(() => {})
// one hit to get the file and one for the eslintignore
expect(fsMock.readFileSync).toHaveBeenCalledTimes(2);
expect(fsMock.readFileSync).toHaveBeenCalledWith(filePath, 'utf8');

expect(readFileSyncMockSpy).toHaveBeenCalledWith(filePath, 'utf8');
});

test('logs error if it cannot read the file from the filePath', () => {
Expand Down