chore(tests): use separate envs for each tests (#371)

nodejs · Feb 12, 2024 · 12f1c31 · 12f1c31
1 parent fe6a307
commit 12f1c31
Show file tree

Hide file tree

Showing 7 changed files with 166 additions and 209 deletions.
diff --git a/tests/Disable.test.ts b/tests/Disable.test.ts
@@ -12,6 +12,7 @@ import {runCli}                               from './_runCli';
 const engine = new Engine();
 
 beforeEach(async () => {
+  // `process.env` is reset after each tests in setupTests.js.
   process.env.COREPACK_HOME = npath.fromPortablePath(await xfs.mktempPromise());
 });
 
@@ -26,15 +27,10 @@ describe(`DisableCommand`, () => {
           for (const variant of getBinaryNames(binName))
             await makeBin(cwd, variant as Filename, {ignorePlatform: true});
 
-      const PATH = process.env.PATH;
-      try {
-        process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${PATH}`;
-        await expect(runCli(cwd, [`disable`])).resolves.toMatchObject({
-          exitCode: 0,
-        });
-      } finally {
-        process.env.PATH = PATH;
-      }
+      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
+      await expect(runCli(cwd, [`disable`])).resolves.toMatchObject({
+        exitCode: 0,
+      });
 
       const sortedEntries = xfs.readdirPromise(cwd).then(entries => {
         return entries.sort();
@@ -84,15 +80,10 @@ describe(`DisableCommand`, () => {
       const dontRemoveBin = await makeBin(cwd, `dont-remove` as Filename);
       binNames.add(ppath.basename(dontRemoveBin));
 
-      const PATH = process.env.PATH;
-      try {
-        process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${PATH}`;
-        await expect(runCli(cwd, [`disable`, `yarn`])).resolves.toMatchObject({
-          exitCode: 0,
-        });
-      } finally {
-        process.env.PATH = PATH;
-      }
+      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
+      await expect(runCli(cwd, [`disable`, `yarn`])).resolves.toMatchObject({
+        exitCode: 0,
+      });
 
       for (const variant of getBinaryNames(`yarn`))
         binNames.delete(variant);

diff --git a/tests/Enable.test.ts b/tests/Enable.test.ts
@@ -12,6 +12,7 @@ import {runCli}                                                         from './
 const engine = new Engine();
 
 beforeEach(async () => {
+  // `process.env` is reset after each tests in setupTests.js.
   process.env.COREPACK_HOME = npath.fromPortablePath(await xfs.mktempPromise());
   process.env.COREPACK_DEFAULT_TO_LATEST = `0`;
 });
@@ -21,17 +22,12 @@ describe(`EnableCommand`, () => {
     await xfs.mktempPromise(async cwd => {
       const corepackBin = await makeBin(cwd, `corepack` as Filename);
 
-      const PATH = process.env.PATH;
-      try {
-        process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${PATH}`;
-        await expect(runCli(cwd, [`enable`])).resolves.toMatchObject({
-          stdout: ``,
-          stderr: ``,
-          exitCode: 0,
-        });
-      } finally {
-        process.env.PATH = PATH;
-      }
+      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
+      await expect(runCli(cwd, [`enable`])).resolves.toMatchObject({
+        stdout: ``,
+        stderr: ``,
+        exitCode: 0,
+      });
 
       const sortedEntries = xfs.readdirPromise(cwd).then(entries => {
         return entries.sort();
@@ -73,17 +69,12 @@ describe(`EnableCommand`, () => {
     await xfs.mktempPromise(async cwd => {
       const corepackBin = await makeBin(cwd, `corepack` as Filename);
 
-      const PATH = process.env.PATH;
-      try {
-        process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${PATH}`;
-        await expect(runCli(cwd, [`enable`, `yarn`])).resolves.toMatchObject({
-          stdout: ``,
-          stderr: ``,
-          exitCode: 0,
-        });
-      } finally {
-        process.env.PATH = PATH;
-      }
+      process.env.PATH = `${npath.fromPortablePath(cwd)}${delimiter}${process.env.PATH}`;
+      await expect(runCli(cwd, [`enable`, `yarn`])).resolves.toMatchObject({
+        stdout: ``,
+        stderr: ``,
+        exitCode: 0,
+      });
 
       const sortedEntries = xfs.readdirPromise(cwd).then(entries => {
         return entries.sort();

diff --git a/tests/Up.test.ts b/tests/Up.test.ts
@@ -5,6 +5,7 @@ import process                            from 'node:process';
 import {runCli}                           from './_runCli';
 
 beforeEach(async () => {
+  // `process.env` is reset after each tests in setupTests.js.
   process.env.COREPACK_HOME = npath.fromPortablePath(await xfs.mktempPromise());
   process.env.COREPACK_DEFAULT_TO_LATEST = `0`;
 });

diff --git a/tests/Use.test.ts b/tests/Use.test.ts
@@ -5,6 +5,7 @@ import process                            from 'node:process';
 import {runCli}                           from './_runCli';
 
 beforeEach(async () => {
+  // `process.env` is reset after each tests in setupTests.js.
   process.env.COREPACK_HOME = npath.fromPortablePath(await xfs.mktempPromise());
   process.env.COREPACK_DEFAULT_TO_LATEST = `0`;
 });