From cb85a5c5470df073fe7e24763b0e0b56c59d479d Mon Sep 17 00:00:00 2001 From: Tim Griesser Date: Tue, 22 Nov 2016 20:48:47 -0500 Subject: [PATCH] Add symlinks during beforeInstall --- __tests__/commands/install.js | 4 ++++ .../.yarn-link/@fakescope/fake-dependency | 1 - .../node_modules/@fakescope/fake-dependency | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 120000 __tests__/fixtures/install/install-dont-overwrite-linked-scoped/.yarn-link/@fakescope/fake-dependency delete mode 120000 __tests__/fixtures/install/install-dont-overwrite-linked-scoped/node_modules/@fakescope/fake-dependency diff --git a/__tests__/commands/install.js b/__tests__/commands/install.js index 36e2529946..ebedbde9a0 100644 --- a/__tests__/commands/install.js +++ b/__tests__/commands/install.js @@ -803,6 +803,10 @@ test.concurrent('install will not overwrite files in symlinked scoped directorie (await fs.readJson(path.join(dependencyPath, 'package.json'))).description, ); assert.ok(!(await fs.exists(path.join(dependencyPath, 'index.js')))); + }, async (cwd) => { + const dirToLink = path.join(cwd, 'dir-to-link'); + await fs.symlink(dirToLink, path.join(cwd, '.yarn-link', '@fakescope', 'fake-dependency')); + await fs.symlink(dirToLink, path.join(cwd, 'node_modules', '@fakescope', 'fake-dependency')); }); }); diff --git a/__tests__/fixtures/install/install-dont-overwrite-linked-scoped/.yarn-link/@fakescope/fake-dependency b/__tests__/fixtures/install/install-dont-overwrite-linked-scoped/.yarn-link/@fakescope/fake-dependency deleted file mode 120000 index a5398b4f4e..0000000000 --- a/__tests__/fixtures/install/install-dont-overwrite-linked-scoped/.yarn-link/@fakescope/fake-dependency +++ /dev/null @@ -1 +0,0 @@ -../../dir-to-link/ \ No newline at end of file diff --git a/__tests__/fixtures/install/install-dont-overwrite-linked-scoped/node_modules/@fakescope/fake-dependency b/__tests__/fixtures/install/install-dont-overwrite-linked-scoped/node_modules/@fakescope/fake-dependency deleted file mode 120000 index a5398b4f4e..0000000000 --- a/__tests__/fixtures/install/install-dont-overwrite-linked-scoped/node_modules/@fakescope/fake-dependency +++ /dev/null @@ -1 +0,0 @@ -../../dir-to-link/ \ No newline at end of file