move fixtures

npm · Apr 8, 2022 · 41e8395 · 41e8395
1 parent c5ce030
commit 41e8395
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 16 deletions.
diff --git a/smoke-tests/package.json b/smoke-tests/package.json
@@ -19,13 +19,11 @@
     "url": "https://github.com/npm/cli.git",
     "directory": "smoke-tests"
   },
-  "dependencies": {
-    "minify-registry-metadata": "^2.2.0"
-  },
   "devDependencies": {
     "@npmcli/eslint-config": "^3.0.1",
     "@npmcli/promise-spawn": "^3.0.0",
     "@npmcli/template-oss": "3.3.2",
+    "minify-registry-metadata": "^2.2.0",
     "rimraf": "^3.0.2",
     "tap": "^16.0.1",
     "which": "^2.0.2"
@@ -38,7 +36,8 @@
     "workspaceRepo": false
   },
   "tap": {
-    "no-coverage": true
+    "no-coverage": true,
+    "files": "test/index.js"
   },
   "files": [
     "bin/",

diff --git a/smoke-tests/lib/abbrev.json → smoke-tests/test/fixtures/abbrev.json b/smoke-tests/lib/abbrev.json → smoke-tests/test/fixtures/abbrev.json
diff --git a/smoke-tests/lib/abbrev.min.json → smoke-tests/test/fixtures/abbrev.min.json b/smoke-tests/lib/abbrev.min.json → smoke-tests/test/fixtures/abbrev.min.json
diff --git a/smoke-tests/lib/abbrev/-/abbrev-1.0.4.tgz → ...s/test/fixtures/abbrev/-/abbrev-1.0.4.tgz b/smoke-tests/lib/abbrev/-/abbrev-1.0.4.tgz → ...s/test/fixtures/abbrev/-/abbrev-1.0.4.tgz
diff --git a/smoke-tests/lib/abbrev/-/abbrev-1.1.1.tgz → ...s/test/fixtures/abbrev/-/abbrev-1.1.1.tgz b/smoke-tests/lib/abbrev/-/abbrev-1.1.1.tgz → ...s/test/fixtures/abbrev/-/abbrev-1.1.1.tgz
diff --git a/smoke-tests/lib/promise-all-reject-late.json → ...est/fixtures/promise-all-reject-late.json b/smoke-tests/lib/promise-all-reject-late.json → ...est/fixtures/promise-all-reject-late.json
diff --git a/...ests/lib/promise-all-reject-late.min.json → ...fixtures/promise-all-reject-late.min.json b/...ests/lib/promise-all-reject-late.min.json → ...fixtures/promise-all-reject-late.min.json
diff --git a/...-late/-/promise-all-reject-late-1.0.1.tgz → ...-late/-/promise-all-reject-late-1.0.1.tgz b/...-late/-/promise-all-reject-late-1.0.1.tgz → ...-late/-/promise-all-reject-late-1.0.1.tgz
diff --git a/smoke-tests/lib/server.js → smoke-tests/test/fixtures/server.js b/smoke-tests/lib/server.js → smoke-tests/test/fixtures/server.js
diff --git a/smoke-tests/test/index.js b/smoke-tests/test/index.js
@@ -4,7 +4,7 @@ const { join, resolve, sep } = require('path')
 const t = require('tap')
 const rimraf = require('rimraf')
 const which = require('which').sync
-const { start, stop, registry } = require('../lib/server.js')
+const { start, stop, registry } = require('./fixtures/server.js')
 
 const { SMOKE_PUBLISH_NPM, CI, PATH } = process.env
 const log = CI ? console.error : () => {}
@@ -14,6 +14,16 @@ const npmCli = join('bin', 'npm-cli.js')
 const execArgv = SMOKE_PUBLISH_NPM ? ['npm'] : [process.execPath, join(cwd, npmCli)]
 const npmDir = SMOKE_PUBLISH_NPM ? realpathSync(which('npm')).replace(sep + npmCli, '') : cwd
 
+// setup server
+t.before(start)
+t.teardown(stop)
+// update notifier should never be written
+t.afterEach((t) => {
+  const updateExists = existsSync(join(cacheLocation, '_update-notifier-last-checked'))
+  t.equal(updateExists, false)
+})
+
+const readFile = filename => readFileSync(resolve(localPrefix, filename), 'utf-8')
 const normalizePath = path => path.replace(/[A-Z]:/, '').replace(/\\/g, '/')
 
 t.cleanSnapshot = s =>
@@ -92,17 +102,6 @@ const exec = async (...args) => {
   return res.stdout
 }
 
-const readFile = filename => readFileSync(resolve(localPrefix, filename), 'utf-8')
-
-// setup server
-t.before(start)
-t.teardown(stop)
-// update notifier should never be written
-t.afterEach((t) => {
-  const updateExists = existsSync(join(cacheLocation, '_update-notifier-last-checked'))
-  t.equal(updateExists, false)
-})
-
 // this test must come first, its package.json will be destroyed and the one
 // created in the next test (npm init) will create a new one that must be
 // present for later tests