test: use t.testdir() instead of manually creating test dirs

test/dir.js

@@ -1,16 +1,14 @@
 const DirFetcher = require('../lib/dir.js')
 const t = require('tap')
-const { relative, resolve, basename } = require('path')
 const npa = require('npm-package-arg')
 const fs = require('fs')
 const { promisify } = require('util')
-const rimraf = promisify(require('rimraf'))
-const mkdirp = require('mkdirp')
-const me = resolve(__dirname, basename(__filename, '.js'))
-rimraf.sync(me)
-mkdirp.sync(me)
+
+const { relative, resolve, basename } = require('path')
+
+const me = t.testdir()
+
 t.cleanSnapshot = str => str.split(process.cwd()).join('${CWD}')
-t.teardown(() => rimraf.sync(me))
 
 const abbrev = resolve(__dirname, 'fixtures/abbrev')
 const abbrevspec = `file:${relative(process.cwd(), abbrev)}`

test/fetcher.js

@@ -15,19 +15,14 @@ if (fakeSudo) {
 }
 
 const { relative, resolve, basename } = require('path')
-const me = resolve(__dirname, basename(__filename, '.js'))
-const Fetcher = require('../lib/fetcher.js')
 const t = require('tap')
+const me = t.testdir()
+const Fetcher = require('../lib/fetcher.js')
 t.cleanSnapshot = s => s.split(process.cwd()).join('{CWD}')
-if (!fakeSudo)
-  t.teardown(() => require('rimraf').sync(me))
 
-require('rimraf').sync(me)
 const npa = require('npm-package-arg')
 const { promisify } = require('util')
-const rimraf = promisify(require('rimraf'))
 const mkdirp = require('mkdirp')
-mkdirp.sync(me)
 
 const _tarballFromResolved = Symbol.for('pacote.Fetcher._tarballFromResolved')
 

test/file.js

@@ -5,11 +5,8 @@ const npa = require('npm-package-arg')
 const { promisify } = require('util')
 const rimraf = promisify(require('rimraf'))
 const mkdirp = require('mkdirp')
-const me = resolve(__dirname, basename(__filename, '.js'))
-rimraf.sync(me)
-mkdirp.sync(me)
+const me = t.testdir()
 t.cleanSnapshot = str => str.split(process.cwd()).join('${CWD}')
-t.teardown(() => rimraf.sync(me))
 
 const abbrev = resolve(__dirname, 'fixtures/abbrev-1.1.1.tgz')
 const abbrevspec = `file:${relative(process.cwd(), abbrev)}`

test/git.js

@@ -25,15 +25,19 @@ const t = require('tap')
 const fs = require('fs')
 const http = require('http')
 
-const {resolve, basename, relative} = require('path')
+const {resolve} = require('path')
 const rimraf = require('rimraf')
 const abbrev = resolve(__dirname, 'fixtures/abbrev-1.1.1.tgz')
 const npa = require('npm-package-arg')
 
-const me = resolve(__dirname, basename(__filename, '.js'))
-rimraf.sync(me)
+t.saveFixture = true
+const me = t.testdir({
+  repo: {},
+  cache: {},
+})
 const repo = resolve(me, 'repo')
 const cache = resolve(me, 'cache')
+
 const abbrevSpec = `file:${abbrev}`
 
 const spawnGit = require('../lib/util/git/spawn.js')

test/index.js

@@ -2,7 +2,7 @@ const t = require('tap')
 const pacote = require('../lib/index.js')
 const fs = require('fs')
 
-const { resolve, basename, relative } = require('path')
+const { resolve, relative } = require('path')
 const abbrev = resolve(__dirname, 'fixtures/abbrev-1.1.1.tgz')
 const abbrevspec = `file:${relative(process.cwd(), abbrev)}`
 const abbrevMani = require('./fixtures/abbrev-manifest-min.json')
@@ -12,10 +12,7 @@ const ignore = resolve(__dirname, 'fixtures/ignore-pkg.tgz')
 const ignorespec = `file:${relative(process.cwd(), ignore)}`
 
 const mkdirp = require('mkdirp')
-const me = resolve(__dirname, basename(__filename, '.js'))
-mkdirp.sync(me)
-const rimraf = require('rimraf')
-t.teardown(() => rimraf.sync(me))
+const me = t.testdir()
 
 t.cleanSnapshot = str => str
   .split(process.cwd()).join('${CWD}')

test/registry.js

@@ -2,13 +2,8 @@ const RegistryFetcher = require('../lib/registry.js')
 const t = require('tap')
 const mr = require('npm-registry-mock')
 const port = 18000 + (+process.env.TAP_CHILD_ID || 0)
-const mkdirp = require('mkdirp')
-const rimraf = require('rimraf')
 const {resolve, basename} = require('path')
-const me = resolve(__dirname, basename(__filename, '.js'))
-rimraf.sync(me)
-mkdirp.sync(me)
-t.teardown(() => rimraf.sync(me))
+const me = t.testdir()
 
 t.test('start mock registry', { bail: true }, t => {
   mr({

test/remote.js

@@ -2,14 +2,9 @@ const RemoteFetcher = require('../lib/remote.js')
 const http = require('http')
 const t = require('tap')
 
-const { relative, resolve, basename } = require('path')
-const me = resolve(__dirname, basename(__filename, '.js'))
-const mkdirp = require('mkdirp')
-const rimraf = require('rimraf')
-rimraf.sync(me)
-mkdirp.sync(me)
+const { relative, resolve } = require('path')
+const me = t.testdir()
 const cache = resolve(me, 'cache')
-t.teardown(() => rimraf.sync(me))
 
 t.cleanSnapshot = str => str.split(''+port).join('{PORT}')
 

test/util/git/clone.js

@@ -3,23 +3,24 @@ const clone = require('../../../lib/util/git/clone.js')
 const t = require('tap')
 const fs = require('fs')
 const {spawn} = require('child_process')
-const mkdirp = require('mkdirp')
 const rimraf = require('rimraf')
 const { promisify } = require('util')
-const { resolve, basename } = require('path')
+const { resolve } = require('path')
 
 const port = 12345 + (+process.env.TAP_CHILD_ID || 0)
 const spawnGit = require('../../../lib/util/git/spawn.js')
-const me = resolve(__dirname, basename(__filename, '.js'))
-rimraf.sync(me)
+t.saveFixture = true
+const me = t.testdir({
+  'submodule-repo': {},
+  repo: {},
+})
 const remote = `git://localhost:${port}/repo`
 const submodsRemote = `git://localhost:${port}/submodule-repo`
 const repo = resolve(me, 'repo')
 
 t.test('create repo', { bail: true }, t => {
   const git = (...cmd) => spawnGit(cmd, { cwd: repo })
   const write = (f, c) => fs.writeFileSync(`${repo}/${f}`, c)
-  mkdirp.sync(repo)
   return git('init')
   .then(() => write('foo', 'bar'))
   .then(() => git('add', 'foo'))
@@ -81,7 +82,6 @@ t.test('create a repo with a submodule', { bail: true }, t => {
   const repo = resolve(me, 'submodule-repo')
   const git = (...cmd) => spawnGit(cmd, { cwd: repo })
   const write = (f, c) => fs.writeFileSync(`${repo}/${f}`, c)
-  mkdirp.sync(repo)
   return git('init')
     .then(() => write('file', 'data'))
     .then(() => git('add', 'file'))

test/util/git/revs.js

@@ -1,25 +1,13 @@
 const revs = require('../../../lib/util/git/revs.js')
 const spawn = require('../../../lib/util/git/spawn.js')
-
-const { resolve, basename } = require('path')
-const repo = resolve(__dirname, basename(__filename, '.js'))
-
-const mkdirp = require('mkdirp')
-const rimraf = require('rimraf')
-const { promisify } = require('util')
-
 const t = require('tap')
-
-t.teardown(() => rimraf.sync(repo))
-
+const repo = t.testdir()
 const fs = require('fs')
 
 const git = (...cmd) => spawn(cmd, {cwd: repo})
 const write = (f, c) => fs.writeFileSync(`${repo}/${f}`, c)
 t.test('setup', t =>
-  promisify(rimraf)(repo)
-  .then(() => mkdirp.sync(repo))
-  .then(() => git('init'))
+  git('init')
   .then(() => write('foo', 'bar'))
   .then(() => git('add', 'foo'))
   .then(() => git('commit', '-m', 'foobar'))

test/util/spawn.js

@@ -1,4 +1,3 @@
-
 const main = () => {
   const t = require('tap')
   const spawn = require('../../lib/util/spawn.js')