Set yarn test config in individual fixture folders; restored original yarnInstall method.

Charan Sarin · Charan Sarin · commit c3b73f36f182 · 2022-03-09T19:03:40.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,3 @@
 /coverage
 /.eslintcache
 /.dccache
-/test/_yarn_cache
diff --git a/bin/cli-install.js b/bin/cli-install.js
@@ -57,16 +57,7 @@ const ensureGitClone = async (remote, local) => {
  */
 const yarnInstall = (local) => {
   const dir = absoluteRepoPath(local)
-  /* c8 ignore start */
-  const args = process.env.TAP
-    ? [
-        'install',
-        '--offline',
-        `--cache-folder ../../../../_yarn_cache/.yarn_${process.env.TAP_CHILD_ID}`
-      ]
-    : ['install']
-  /* c8 ignore stop */
-  return run('yarn', args, dir)
+  return run('yarn', ['install'], dir)
 }
 
 /**
diff --git a/test/_fixtures/addrepos/.gitignore b/test/_fixtures/addrepos/.gitignore
@@ -0,0 +1 @@
+/.yarn_cache
diff --git a/test/_fixtures/addrepos/.yarnrc b/test/_fixtures/addrepos/.yarnrc
@@ -1,2 +1,4 @@
 yarn-offline-mirror "../../npm-packages-offline-cache"
 yarn-offline-mirror-pruning true
+--cache-folder ./.yarn_cache
+--offline
diff --git a/test/_fixtures/empty/.gitignore b/test/_fixtures/empty/.gitignore
@@ -0,0 +1 @@
+/.yarn_cache
diff --git a/test/_fixtures/empty/.yarnrc b/test/_fixtures/empty/.yarnrc
@@ -1,2 +1,4 @@
 yarn-offline-mirror "../../npm-packages-offline-cache"
 yarn-offline-mirror-pruning true
+--cache-folder ./.yarn_cache
+--offline
diff --git a/test/_fixtures/listrepos/.gitignore b/test/_fixtures/listrepos/.gitignore
@@ -0,0 +1 @@
+/.yarn_cache
diff --git a/test/_fixtures/listrepos/.yarnrc b/test/_fixtures/listrepos/.yarnrc
@@ -1,2 +1,4 @@
 yarn-offline-mirror "../../npm-packages-offline-cache"
 yarn-offline-mirror-pruning true
+--cache-folder ./.yarn_cache
+--offline
diff --git a/test/_fixtures/norepos/.gitignore b/test/_fixtures/norepos/.gitignore
@@ -0,0 +1 @@
+/.yarn_cache
diff --git a/test/_fixtures/norepos/.yarnrc b/test/_fixtures/norepos/.yarnrc
@@ -1,2 +1,4 @@
 yarn-offline-mirror "../../npm-packages-offline-cache"
 yarn-offline-mirror-pruning true
+--cache-folder ./.yarn_cache
+--offline
diff --git a/test/_fixtures/pullrepos/.gitignore b/test/_fixtures/pullrepos/.gitignore
@@ -0,0 +1 @@
+/.yarn_cache
diff --git a/test/_fixtures/pullrepos/.yarnrc b/test/_fixtures/pullrepos/.yarnrc
@@ -1,2 +1,4 @@
 yarn-offline-mirror "../../npm-packages-offline-cache"
 yarn-offline-mirror-pruning true
+--cache-folder ./.yarn_cache
+--offline
diff --git a/test/_fixtures/runrepos/.gitignore b/test/_fixtures/runrepos/.gitignore
@@ -0,0 +1 @@
+/.yarn_cache
diff --git a/test/_fixtures/runrepos/.yarnrc b/test/_fixtures/runrepos/.yarnrc
@@ -1,2 +1,4 @@
 yarn-offline-mirror "../../npm-packages-offline-cache"
 yarn-offline-mirror-pruning true
+--cache-folder ./.yarn_cache
+--offline
diff --git a/test/helper.js b/test/helper.js
@@ -42,11 +42,15 @@ export const cleanupGit = (testPhase = 'install') => {
   if (testPhase === 'install') {
     fs.removeSync(path.resolve(__dirname, './_stubs/demorepo/.git'))
     fs.removeSync(path.resolve(__dirname, `./_fixtures/addrepos/repos`))
+    fs.removeSync(path.resolve(__dirname, `./_fixtures/addrepos/.yarn_cache`))
     return
   }
 
   fs.removeSync(path.resolve(__dirname, `./_stubs/demorepo_${testPhase}/.git`))
   fs.removeSync(path.resolve(__dirname, `./_fixtures/${testPhase}repos/repos`))
+  fs.removeSync(
+    path.resolve(__dirname, `./_fixtures/${testPhase}repos/.yarn_cache`)
+  )
 }
 
 export const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms))

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,15 @@ export const cleanupGit = (testPhase = 'install') => {`
`42`	`42`	`if (testPhase === 'install') {`
`43`	`43`	`fs.removeSync(path.resolve(__dirname, './_stubs/demorepo/.git'))`
`44`	`44`	fs.removeSync(path.resolve(__dirname, `./_fixtures/addrepos/repos`))
	`45`	+ fs.removeSync(path.resolve(__dirname, `./_fixtures/addrepos/.yarn_cache`))
`45`	`46`	`return`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	fs.removeSync(path.resolve(__dirname, `./_stubs/demorepo_${testPhase}/.git`))
`49`	`50`	fs.removeSync(path.resolve(__dirname, `./_fixtures/${testPhase}repos/repos`))
	`51`	`+ fs.removeSync(`
	`52`	+ path.resolve(__dirname, `./_fixtures/${testPhase}repos/.yarn_cache`)
	`53`	`+ )`
`50`	`54`	`}`
`51`	`55`
`52`	`56`	`export const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms))`