From 4748a5a245cbe87897297b629555ca8f83b9f377 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 3 Mar 2026 00:28:04 +0100
Subject: [PATCH 1/3] chore(tests): prefer `--install-directory` over `PATH`
 manipulation

---
 tests/Disable.test.ts | 3 +--
 tests/Enable.test.ts  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/Disable.test.ts b/tests/Disable.test.ts
index fcea6a685..bde91bf17 100644
--- a/tests/Disable.test.ts
+++ b/tests/Disable.test.ts
@@ -80,8 +80,7 @@ describe(`DisableCommand`, () => {
       const dontRemoveBin = await makeBin(cwd, `dont-remove` as Filename);
       binNames.add(ppath.basename(dontRemoveBin));
 
-      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
-      await expect(runCli(cwd, [`disable`, `yarn`])).resolves.toMatchObject({
+      await expect(runCli(cwd, [`disable`, `--install-directory=${npath.fromPortablePath(cwd)}`, `yarn`])).resolves.toMatchObject({
         exitCode: 0,
       });
 
diff --git a/tests/Enable.test.ts b/tests/Enable.test.ts
index 8d559c6b9..c85f91f45 100644
--- a/tests/Enable.test.ts
+++ b/tests/Enable.test.ts
@@ -70,8 +70,7 @@ describe(`EnableCommand`, () => {
     await xfs.mktempPromise(async cwd => {
       const corepackBin = await makeBin(cwd, `corepack` as Filename);
 
-      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
-      await expect(runCli(cwd, [`enable`, `yarn`])).resolves.toMatchObject({
+      await expect(runCli(cwd, [`enable`, `--install-directory=${npath.fromPortablePath(cwd)}`, `yarn`])).resolves.toMatchObject({
         stdout: ``,
         stderr: ``,
         exitCode: 0,

From 53e9c1d0de7f55c8dc6524c271b76d0c2f5b219f Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 3 Mar 2026 01:17:10 +0100
Subject: [PATCH 2/3] fixup! chore(tests): prefer `--install-directory` over
 `PATH` manipulation

---
 tests/Disable.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Disable.test.ts b/tests/Disable.test.ts
index bde91bf17..4a7fe0f41 100644
--- a/tests/Disable.test.ts
+++ b/tests/Disable.test.ts
@@ -107,7 +107,7 @@ describe(`DisableCommand`, () => {
         ppath.join(cwd, `yarn`),
       );
 
-      await expect(runCli(cwd, [`disable`])).resolves.toMatchObject({
+      await expect(runCli(cwd, [`disable`, `--install-directory=${npath.fromPortablePath(cwd)}`])).resolves.toMatchObject({
         exitCode: 0,
       });
 

From 5727f46e9d106a067d215116cecb2bf2e76b987d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 3 Mar 2026 01:32:15 +0100
Subject: [PATCH 3/3] fixup! chore(tests): prefer `--install-directory` over
 `PATH` manipulation

---
 tests/Disable.test.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Disable.test.ts b/tests/Disable.test.ts
index 4a7fe0f41..3c497e736 100644
--- a/tests/Disable.test.ts
+++ b/tests/Disable.test.ts
@@ -102,12 +102,14 @@ describe(`DisableCommand`, () => {
       await xfs.mkdirPromise(ppath.join(cwd, `switch/bin`), {recursive: true});
       await xfs.writeFilePromise(ppath.join(cwd, `switch/bin/yarn`), `hello`);
 
-      await xfs.linkPromise(
+      await xfs.symlinkPromise(
         ppath.join(cwd, `switch/bin/yarn`),
         ppath.join(cwd, `yarn`),
       );
 
       await expect(runCli(cwd, [`disable`, `--install-directory=${npath.fromPortablePath(cwd)}`])).resolves.toMatchObject({
+        stdout: ``,
+        stderr: expect.stringMatching(/^yarn is already installed in .+ and points to a Yarn Switch install - skipping\n$/),
         exitCode: 0,
       });