[npm#6960] Correctly handle scenario where prefix is the current work…

…ing directory
ficocelliguy · Feb 7, 2024 · ae7dae8 · ae7dae8
1 parent d04111d
commit ae7dae8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/lib/commands/install.js b/lib/commands/install.js
@@ -131,7 +131,7 @@ class Install extends ArboristWorkspaceCmd {
     args = args.filter(a => resolve(a) !== this.npm.prefix)
 
     // `npm i -g` => "install this package globally"
-    if (where === globalTop && !args.length) {
+    if (isGlobalInstall && where === globalTop && !args.length) {
       args = ['.']
     }
 

diff --git a/test/fixtures/mock-npm.js b/test/fixtures/mock-npm.js
@@ -131,6 +131,7 @@ const setupMockNpm = async (t, {
   setCmd = false,
   // test dirs
   prefixDir = {},
+  prefixOverride = null, // sets global and local prefix to this, the same as the `--prefix` flag
   homeDir = {},
   cacheDir = {},
   globalPrefixDir = { node_modules: {} },
@@ -195,9 +196,9 @@ const setupMockNpm = async (t, {
 
   const dirs = {
     testdir: dir,
-    prefix: path.join(dir, 'prefix'),
+    prefix: prefixOverride ?? path.join(dir, 'prefix'),
     cache: path.join(dir, 'cache'),
-    globalPrefix: path.join(dir, 'global'),
+    globalPrefix: prefixOverride ?? path.join(dir, 'global'),
     home: path.join(dir, 'home'),
     other: path.join(dir, 'other'),
   }

diff --git a/test/lib/commands/install.js b/test/lib/commands/install.js
@@ -114,6 +114,25 @@ t.test('exec commands', async t => {
     t.strictSame(SCRIPTS, [], 'no scripts when adding dep')
   })
 
+  await t.test('should not self-install package if prefix is the same as PWD', async t => {
+    let REIFY_CALLED_WITH = null
+    const { npm } = await loadMockNpm(t, {
+      mocks: {
+        '{LIB}/utils/reify-finish.js': async () => {},
+        '@npmcli/run-script': () => {},
+        '@npmcli/arborist': function () {
+          this.reify = (opts) => {
+            REIFY_CALLED_WITH = opts
+          }
+        },
+      },
+      prefixOverride: process.cwd(),
+    })
+
+    await npm.exec('install')
+    t.equal(REIFY_CALLED_WITH.add.length, 0, 'did not install current directory as a dependency')
+  })
+
   await t.test('should install globally using Arborist', async t => {
     const SCRIPTS = []
     let ARB_ARGS = null