Add usage of shell when creating Settings #297
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,8 @@ export function registerSnapshotCodeLens(enableSnapshotPreviews: boolean) { | |
|
|
||
| class SnapshotCodeLensProvider implements vscode.CodeLensProvider { | ||
| public provideCodeLenses(document: vscode.TextDocument, _token: vscode.CancellationToken) { | ||
| // temporarily use `undefined` as parser argument, until Jest/#6212 is published | ||
| const snapshots = new Snapshot(undefined) | ||
|
There was a problem hiding this comment. How do you feel about adding another line to the comment explaining when we can remove the argument? It'd be quick for someone who sees it to test it and see if the type updated type definition with the optional arg has been published with jestjs/jest#6212. There was a problem hiding this comment. My plan was to remove it by myself as soon as there is a new release of Jest (I had it written to my calendar), but since jest-editor-supportv23 already includes that change, the |
||
| return snapshots.getMetadata(document.uri.fsPath).map(snapshot => { | ||
| const { line } = snapshot.node.loc.start | ||
| const range = new vscode.Range(line - 1, 0, line - 1, 0) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,68 @@ | ||
| jest.unmock('../src/helpers') | ||
| jest.mock('fs') | ||
| jest.mock('vscode', () => ({ | ||
| window: { | ||
| showWarningMessage: () => {}, | ||
| }, | ||
| })) | ||
|
|
||
| import { pathToJestPackageJSON, isCRATestCommand, pathToJest } from '../src/helpers' | ||
| import { existsSync, readFileSync } from 'fs' | ||
| import * as path from 'path' | ||
|
|
||
| const existsMock = existsSync as jest.Mock<boolean> | ||
| const readFileMock = readFileSync as jest.Mock<string> | ||
|
|
||
| describe('ModuleHelpers', () => { | ||
| describe('pathToJest', () => { | ||
| it('should return the set value', () => { | ||
| const workspace: any = { | ||
| pathToJest: 'abcd', | ||
| } | ||
| expect(pathToJest(workspace)).toBe(workspace.pathToJest) | ||
| }) | ||
|
|
||
| it('should recognize CRA apps', () => { | ||
| readFileMock.mockReturnValueOnce('{"scripts":{"test":"react-scripts test"}}') | ||
|
|
||
| const workspace: any = { | ||
| rootPath: '', | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJest(workspace)).toBe('npm test --') | ||
| }) | ||
|
|
||
| it('should default to `node_modules/.bin/jest`', () => { | ||
| readFileMock.mockReturnValueOnce('{}') | ||
| existsMock.mockReturnValueOnce(true) | ||
|
|
||
| const defaultPath = path.normalize('node_modules/.bin/jest') | ||
| const workspace: any = { | ||
| rootPath: '', | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJest(workspace)).toBe(defaultPath) | ||
| }) | ||
|
|
||
| it('should fallback to `jest` if everything other fails', () => { | ||
| readFileMock.mockReturnValueOnce('{}') | ||
| existsMock.mockReturnValueOnce(false) | ||
|
|
||
| const workspace: any = { | ||
| rootPath: '', | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJest(workspace)).toBe('jest') | ||
| }) | ||
| }) | ||
|
|
||
|
There was a problem hiding this comment. Nice. This makes me sad we duplicated this effort. 😭 There was a problem hiding this comment. At least we now can keep the best of both PRs 😉. Sorry that I didn't mention it already when discussing 324. |
||
| describe('pathToJestPackageJSON', () => { | ||
| it('should return null when not found', () => { | ||
| existsMock.mockReturnValueOnce(false).mockReturnValueOnce(false) | ||
|
|
||
| const workspace: any = { | ||
| rootPath: '', | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJestPackageJSON(workspace)).toBe(null) | ||
| }) | ||
|
|
@@ -28,7 +75,7 @@ describe('ModuleHelpers', () => { | |
|
|
||
| const workspace: any = { | ||
| rootPath: '', | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJestPackageJSON(workspace)).toBe(expected) | ||
| }) | ||
|
|
@@ -39,7 +86,7 @@ describe('ModuleHelpers', () => { | |
|
|
||
| const workspace: any = { | ||
| rootPath: '', | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJestPackageJSON(workspace)).toBe(expected) | ||
| }) | ||
|
|
@@ -52,7 +99,7 @@ describe('ModuleHelpers', () => { | |
|
|
||
| const workspace: any = { | ||
| rootPath: path.join('..', '..'), | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJestPackageJSON(workspace)).toBe(expected) | ||
| }) | ||
|
|
@@ -63,7 +110,7 @@ describe('ModuleHelpers', () => { | |
|
|
||
| const workspace: any = { | ||
| rootPath: path.join('..', '..'), | ||
| pathToJest: '', | ||
| } | ||
| expect(pathToJestPackageJSON(workspace)).toBe(expected) | ||
| }) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One of us is going to have a failing test if this changes. 😉