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

Dashed-args #1034

Merged
merged 3 commits into from Jun 14, 2023
Merged

Dashed-args #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86da352
adding useDashedArgs setting
connectdotz Jun 13, 2023
404cc3b
upgrade jest-editor-support to 31.1.0
connectdotz Jun 14, 2023
9f720b4
address lint issue
connectdotz Jun 14, 2023
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
8 changes: 7 additions & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -180,6 +180,12 @@
"type": "object",
"default": null,
"scope": "resource"
},
"jest.useDashedArgs": {
"markdownDescription": "Use dashed args for jest command line.",
"type": "boolean",
"default": false,
"scope": "resource"
}
}
},
Expand Down Expand Up @@ -486,7 +492,7 @@
"dependencies": {
"istanbul-lib-coverage": "^3.2.0",
"istanbul-lib-source-maps": "^4.0.1",
"jest-editor-support": "^31.0.1"
"jest-editor-support": "^31.1.0"
},
"devDependencies": {
"@types/istanbul-lib-coverage": "^2.0.4",
Expand Down
4 changes: 3 additions & 1 deletion src/JestExt/helper.ts
View file
Open in desktop
Expand Up @@ -66,7 +66,8 @@ export const createJestExtContext = (
options?.collectCoverage ?? settings.showCoverageOnLoad,
settings.debugMode,
settings.nodeEnv,
settings.shell.toSetting()
settings.shell.toSetting(),
settings.useDashedArgs
);
};
return {
Expand Down Expand Up @@ -121,6 +122,7 @@ export const getExtensionResourceSettings = (uri: vscode.Uri): PluginResourceSet
autoRun: new AutoRun(config.get<JestExtAutoRunSetting | null>('autoRun')),
autoRevealOutput: config.get<AutoRevealOutputType>('autoRevealOutput') ?? 'on-run',
parserPluginOptions: config.get<JESParserPluginOptions>('parserPluginOptions'),
useDashedArgs: config.get<boolean>('useDashedArgs') ?? false,
};
};

Expand Down
1 change: 1 addition & 0 deletions src/Settings/index.ts
View file
Open in desktop
Expand Up @@ -51,6 +51,7 @@ export interface PluginResourceSettings {
monitorLongRun?: MonitorLongRun;
autoRevealOutput: AutoRevealOutputType;
parserPluginOptions?: JESParserPluginOptions;
useDashedArgs?: boolean;
}

export interface PluginWindowSettings {
Expand Down
12 changes: 12 additions & 0 deletions tests/JestExt/helper.test.ts
View file
Open in desktop
Expand Up @@ -56,6 +56,17 @@ describe('createJestExtContext', () => {
expect(toFilePath).toHaveBeenCalledWith(rootPath);
expect(runnerWorkspace).toEqual(mockRunnerWorkspace);
});
it('will pass through useDashedArgs', () => {
const settings: any = { ...baseSettings, useDashedArgs: true };

jest.clearAllMocks();

const { createRunnerWorkspace } = createJestExtContext(workspaceFolder, settings, output);
createRunnerWorkspace();
const args = (ProjectWorkspace as jest.Mocked<any>).mock.calls[0];
const [useDashedArgs] = [args[9]];
expect(useDashedArgs).toBeTruthy();
});
describe('allow creating runnerWorkspace with custom options', () => {
it('outputFileSuffix and collectCoverage', () => {
const settings: any = { ...baseSettings, showCoverageOnLoad: false };
Expand Down Expand Up @@ -163,6 +174,7 @@ describe('getExtensionResourceSettings()', () => {
shell: mockShell,
autoRevealOutput: 'on-run',
parserPluginOptions: null,
useDashedArgs: false,
});
});

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -2344,10 +2344,10 @@ jest-each@^29.3.1:
jest-util "^29.3.1"
pretty-format "^29.3.1"

jest-editor-support@^31.0.1:
version "31.0.1"
resolved "https://registry.yarnpkg.com/jest-editor-support/-/jest-editor-support-31.0.1.tgz#029d2fb29c5a455b628a3ddc0f07bab810ab3bbd"
integrity sha512-pzY3MypHzZaNNmawFZoEc5N7X+GQvtiy4KuPcsYC3ROXdVoGh0qdladd4pRrbuaggrTAGPOMxAq3x+BDVvqErw==
jest-editor-support@^31.1.0:
version "31.1.0"
resolved "https://registry.yarnpkg.com/jest-editor-support/-/jest-editor-support-31.1.0.tgz#087a8954d465288f3c544c75feb223f4bc31cea5"
integrity sha512-CGDZh5gO4NRthr6ocmD13pkuSDqZ03Cq+f6UuvwELoNN7p7rkZrEwjPZ/ysMDWoEzRtlTFZ+7sYmfE4kuyhIhQ==
dependencies:
"@babel/parser" "^7.20.7"
"@babel/runtime" "^7.20.7"
Expand Down