Merge 00ea50d into b3f78ed

jest-community · Jan 13, 2024 · 12e1b28 · 12e1b28
2 parents b3f78ed + 00ea50d
commit 12e1b28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/JestExt/run-shell.ts b/src/JestExt/run-shell.ts
@@ -41,7 +41,7 @@ export class RunShell {
         this.nonLoginShell = setting;
         this.loginShell = this.getLoginShell(setting);
       } else {
-        if (setting.args.length > 0) {
+        if (setting.args?.length > 0) {
           this._useLoginShell = true;
           this.nonLoginShell = undefined;
           this.loginShell = setting;

diff --git a/tests/JestExt/run-shell.test.ts b/tests/JestExt/run-shell.test.ts
@@ -30,6 +30,7 @@ describe('RunnerShell', () => {
       ${6} | ${'darwin'} | ${{ path: 'bash', args: ['--login'] }} | ${{ path: 'bash', args: ['--login'] }} | ${true}       | ${undefined}
       ${7} | ${'linux'}  | ${undefined}                           | ${LoginShells.sh}                      | ${false}      | ${undefined}
       ${8} | ${'linux'}  | ${'whatever'}                          | ${undefined}                           | ${'never'}    | ${undefined}
+      ${9} | ${'darwin'} | ${{ path: '/bin/zsh' }}                | ${LoginShells.zsh}                     | ${false}      | ${'/bin/zsh'}
     `('case $case', ({ platform, setting, loginShell, settingOverride, useLoginShell }) => {
       jest.clearAllMocks();
       mockPlatform.mockReturnValue(platform);