Skip to content

Commit 9a5e2ae

Browse files
author
Zoo (VP)
committed
fix(terminal): use shell-integration-safe --login arg in E2E test
--noprofile also blocks VS Code's bash shell integration injection (just like --norc). Use --login instead, which is safe for shell integration while still proving custom profile args pass-through.
1 parent 82d31f4 commit 9a5e2ae

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

apps/vscode-e2e/src/suite/tools/terminal-profile.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ suite("Terminal Profile", function () {
6666
"linux",
6767
{
6868
...originalProfiles,
69-
[PROFILE_NAME]: { path: "/bin/bash", args: ["--noprofile"] },
69+
[PROFILE_NAME]: { path: "/bin/bash", args: ["--login"] },
7070
},
7171
vscode.ConfigurationTarget.Global,
7272
)
@@ -172,7 +172,7 @@ suite("Terminal Profile", function () {
172172
options.name === "Zoo Code" &&
173173
options.shellPath === "/bin/bash" &&
174174
Array.isArray(options.shellArgs) &&
175-
options.shellArgs.includes("--noprofile")
175+
options.shellArgs.includes("--login")
176176
)
177177
})
178178
assert.ok(profileTerminal, "Expected a Zoo Code terminal created with the configured Bash profile")

src/integrations/terminal/Terminal.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class Terminal extends BaseTerminal {
5959

6060
// When the resolved shell came from a VS Code terminal profile,
6161
// also pass the profile's shellArgs so the integrated terminal
62-
// uses the same arguments (e.g. --noprofile --norc for bash).
62+
// uses the same arguments (e.g. --login for bash).
6363
const profileShell = Terminal.getProfileShell()
6464

6565
if (profileShell?.shellArgs) {

0 commit comments

Comments
 (0)