From c3ab25f3f54038a813f765845a72ee9f9d836d7d Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Wed, 25 Jul 2018 21:15:24 -0700 Subject: [PATCH 1/4] doc: file-specifier: Remove stray comment --- doc/spec/file-specifiers.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/spec/file-specifiers.md b/doc/spec/file-specifiers.md index de294045e7c90..e737909db5257 100644 --- a/doc/spec/file-specifiers.md +++ b/doc/spec/file-specifiers.md @@ -55,9 +55,6 @@ note for the `npm-shrinkwrap.json` as it means the specifier there will be different then the original `package.json` (where it was relative to that `package.json`). -# No, for `file:` type specifiers, we SHOULD shrinkwrap. Other symlinks we -# should not. Other symlinks w/o the link spec should be an error. - When shrinkwrapping file specifiers, the contents of the destination package's `node_modules` WILL NOT be included in the shrinkwrap. If you want to lock down the destination package's `node_modules` you should create a shrinkwrap for it From 3fbc7c9cf06bfa164ee52b66487722465fd5e871 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Wed, 18 Jan 2017 14:13:50 -0800 Subject: [PATCH 2/4] test: Move concurrent capable tests out of tap --- .../all-package-metadata-cache-stream-unit.js | 0 .../all-package-metadata-write-stream-unit.js | 0 test/{tap => integration}/cache-add-unpublished.js | 0 test/{tap => integration}/git-npmignore.js | 0 test/{tap => integration}/install-package-json-order.js | 0 .../install-scoped-with-bundled-dependency.js | 0 test/{tap => integration}/optional-metadep-rollback-collision.js | 0 test/{tap => integration}/outdated-git.js | 0 test/{tap => integration}/pack-scoped.js | 0 test/{tap => integration}/prepare.js | 0 test/{tap => integration}/prepublish.js | 0 test/{tap => integration}/scripts-whitespace-windows.js | 0 test/{tap => integration}/shrinkwrap-default-dev.js | 0 test/{tap => integration}/shrinkwrap-local-dependency.js | 0 test/{tap => integration}/shrinkwrap-optional-platform.js | 0 test/{tap => integration}/tag-version-prefix.js | 0 test/{tap => integration}/tagged-version-matching.js | 0 test/{tap => integration}/unpack-foreign-tarball.js | 0 test/{tap => integration}/upgrade-lifecycles.js | 0 test/{tap => integration}/version-from-git.js | 0 test/{tap => integration}/version-git-not-clean.js | 0 test/{tap => integration}/version-lifecycle.js | 0 test/{tap => integration}/version-message-config.js | 0 test/{tap => integration}/version-no-git.js | 0 test/{tap => integration}/version-no-tags.js | 0 test/{tap => integration}/version-sub-directory-shrinkwrap.js | 0 test/{tap => integration}/version-sub-directory.js | 0 test/{tap => integration}/version-update-shrinkwrap.js | 0 test/{tap => unit}/unit-child-path.js | 0 test/{tap => unit}/unit-deps-earliestInstallable.js | 0 test/{tap => unit}/unit-deps-removeObsoleteDep.js | 0 test/{tap => unit}/unit-deps-replaceModule.js | 0 test/{tap => unit}/unit-module-name.js | 0 test/{tap => unit}/unit-package-id.js | 0 34 files changed, 0 insertions(+), 0 deletions(-) rename test/{tap => integration}/all-package-metadata-cache-stream-unit.js (100%) rename test/{tap => integration}/all-package-metadata-write-stream-unit.js (100%) rename test/{tap => integration}/cache-add-unpublished.js (100%) rename test/{tap => integration}/git-npmignore.js (100%) rename test/{tap => integration}/install-package-json-order.js (100%) rename test/{tap => integration}/install-scoped-with-bundled-dependency.js (100%) rename test/{tap => integration}/optional-metadep-rollback-collision.js (100%) rename test/{tap => integration}/outdated-git.js (100%) rename test/{tap => integration}/pack-scoped.js (100%) rename test/{tap => integration}/prepare.js (100%) rename test/{tap => integration}/prepublish.js (100%) rename test/{tap => integration}/scripts-whitespace-windows.js (100%) rename test/{tap => integration}/shrinkwrap-default-dev.js (100%) rename test/{tap => integration}/shrinkwrap-local-dependency.js (100%) rename test/{tap => integration}/shrinkwrap-optional-platform.js (100%) rename test/{tap => integration}/tag-version-prefix.js (100%) rename test/{tap => integration}/tagged-version-matching.js (100%) rename test/{tap => integration}/unpack-foreign-tarball.js (100%) rename test/{tap => integration}/upgrade-lifecycles.js (100%) rename test/{tap => integration}/version-from-git.js (100%) rename test/{tap => integration}/version-git-not-clean.js (100%) rename test/{tap => integration}/version-lifecycle.js (100%) rename test/{tap => integration}/version-message-config.js (100%) rename test/{tap => integration}/version-no-git.js (100%) rename test/{tap => integration}/version-no-tags.js (100%) rename test/{tap => integration}/version-sub-directory-shrinkwrap.js (100%) rename test/{tap => integration}/version-sub-directory.js (100%) rename test/{tap => integration}/version-update-shrinkwrap.js (100%) rename test/{tap => unit}/unit-child-path.js (100%) rename test/{tap => unit}/unit-deps-earliestInstallable.js (100%) rename test/{tap => unit}/unit-deps-removeObsoleteDep.js (100%) rename test/{tap => unit}/unit-deps-replaceModule.js (100%) rename test/{tap => unit}/unit-module-name.js (100%) rename test/{tap => unit}/unit-package-id.js (100%) diff --git a/test/tap/all-package-metadata-cache-stream-unit.js b/test/integration/all-package-metadata-cache-stream-unit.js similarity index 100% rename from test/tap/all-package-metadata-cache-stream-unit.js rename to test/integration/all-package-metadata-cache-stream-unit.js diff --git a/test/tap/all-package-metadata-write-stream-unit.js b/test/integration/all-package-metadata-write-stream-unit.js similarity index 100% rename from test/tap/all-package-metadata-write-stream-unit.js rename to test/integration/all-package-metadata-write-stream-unit.js diff --git a/test/tap/cache-add-unpublished.js b/test/integration/cache-add-unpublished.js similarity index 100% rename from test/tap/cache-add-unpublished.js rename to test/integration/cache-add-unpublished.js diff --git a/test/tap/git-npmignore.js b/test/integration/git-npmignore.js similarity index 100% rename from test/tap/git-npmignore.js rename to test/integration/git-npmignore.js diff --git a/test/tap/install-package-json-order.js b/test/integration/install-package-json-order.js similarity index 100% rename from test/tap/install-package-json-order.js rename to test/integration/install-package-json-order.js diff --git a/test/tap/install-scoped-with-bundled-dependency.js b/test/integration/install-scoped-with-bundled-dependency.js similarity index 100% rename from test/tap/install-scoped-with-bundled-dependency.js rename to test/integration/install-scoped-with-bundled-dependency.js diff --git a/test/tap/optional-metadep-rollback-collision.js b/test/integration/optional-metadep-rollback-collision.js similarity index 100% rename from test/tap/optional-metadep-rollback-collision.js rename to test/integration/optional-metadep-rollback-collision.js diff --git a/test/tap/outdated-git.js b/test/integration/outdated-git.js similarity index 100% rename from test/tap/outdated-git.js rename to test/integration/outdated-git.js diff --git a/test/tap/pack-scoped.js b/test/integration/pack-scoped.js similarity index 100% rename from test/tap/pack-scoped.js rename to test/integration/pack-scoped.js diff --git a/test/tap/prepare.js b/test/integration/prepare.js similarity index 100% rename from test/tap/prepare.js rename to test/integration/prepare.js diff --git a/test/tap/prepublish.js b/test/integration/prepublish.js similarity index 100% rename from test/tap/prepublish.js rename to test/integration/prepublish.js diff --git a/test/tap/scripts-whitespace-windows.js b/test/integration/scripts-whitespace-windows.js similarity index 100% rename from test/tap/scripts-whitespace-windows.js rename to test/integration/scripts-whitespace-windows.js diff --git a/test/tap/shrinkwrap-default-dev.js b/test/integration/shrinkwrap-default-dev.js similarity index 100% rename from test/tap/shrinkwrap-default-dev.js rename to test/integration/shrinkwrap-default-dev.js diff --git a/test/tap/shrinkwrap-local-dependency.js b/test/integration/shrinkwrap-local-dependency.js similarity index 100% rename from test/tap/shrinkwrap-local-dependency.js rename to test/integration/shrinkwrap-local-dependency.js diff --git a/test/tap/shrinkwrap-optional-platform.js b/test/integration/shrinkwrap-optional-platform.js similarity index 100% rename from test/tap/shrinkwrap-optional-platform.js rename to test/integration/shrinkwrap-optional-platform.js diff --git a/test/tap/tag-version-prefix.js b/test/integration/tag-version-prefix.js similarity index 100% rename from test/tap/tag-version-prefix.js rename to test/integration/tag-version-prefix.js diff --git a/test/tap/tagged-version-matching.js b/test/integration/tagged-version-matching.js similarity index 100% rename from test/tap/tagged-version-matching.js rename to test/integration/tagged-version-matching.js diff --git a/test/tap/unpack-foreign-tarball.js b/test/integration/unpack-foreign-tarball.js similarity index 100% rename from test/tap/unpack-foreign-tarball.js rename to test/integration/unpack-foreign-tarball.js diff --git a/test/tap/upgrade-lifecycles.js b/test/integration/upgrade-lifecycles.js similarity index 100% rename from test/tap/upgrade-lifecycles.js rename to test/integration/upgrade-lifecycles.js diff --git a/test/tap/version-from-git.js b/test/integration/version-from-git.js similarity index 100% rename from test/tap/version-from-git.js rename to test/integration/version-from-git.js diff --git a/test/tap/version-git-not-clean.js b/test/integration/version-git-not-clean.js similarity index 100% rename from test/tap/version-git-not-clean.js rename to test/integration/version-git-not-clean.js diff --git a/test/tap/version-lifecycle.js b/test/integration/version-lifecycle.js similarity index 100% rename from test/tap/version-lifecycle.js rename to test/integration/version-lifecycle.js diff --git a/test/tap/version-message-config.js b/test/integration/version-message-config.js similarity index 100% rename from test/tap/version-message-config.js rename to test/integration/version-message-config.js diff --git a/test/tap/version-no-git.js b/test/integration/version-no-git.js similarity index 100% rename from test/tap/version-no-git.js rename to test/integration/version-no-git.js diff --git a/test/tap/version-no-tags.js b/test/integration/version-no-tags.js similarity index 100% rename from test/tap/version-no-tags.js rename to test/integration/version-no-tags.js diff --git a/test/tap/version-sub-directory-shrinkwrap.js b/test/integration/version-sub-directory-shrinkwrap.js similarity index 100% rename from test/tap/version-sub-directory-shrinkwrap.js rename to test/integration/version-sub-directory-shrinkwrap.js diff --git a/test/tap/version-sub-directory.js b/test/integration/version-sub-directory.js similarity index 100% rename from test/tap/version-sub-directory.js rename to test/integration/version-sub-directory.js diff --git a/test/tap/version-update-shrinkwrap.js b/test/integration/version-update-shrinkwrap.js similarity index 100% rename from test/tap/version-update-shrinkwrap.js rename to test/integration/version-update-shrinkwrap.js diff --git a/test/tap/unit-child-path.js b/test/unit/unit-child-path.js similarity index 100% rename from test/tap/unit-child-path.js rename to test/unit/unit-child-path.js diff --git a/test/tap/unit-deps-earliestInstallable.js b/test/unit/unit-deps-earliestInstallable.js similarity index 100% rename from test/tap/unit-deps-earliestInstallable.js rename to test/unit/unit-deps-earliestInstallable.js diff --git a/test/tap/unit-deps-removeObsoleteDep.js b/test/unit/unit-deps-removeObsoleteDep.js similarity index 100% rename from test/tap/unit-deps-removeObsoleteDep.js rename to test/unit/unit-deps-removeObsoleteDep.js diff --git a/test/tap/unit-deps-replaceModule.js b/test/unit/unit-deps-replaceModule.js similarity index 100% rename from test/tap/unit-deps-replaceModule.js rename to test/unit/unit-deps-replaceModule.js diff --git a/test/tap/unit-module-name.js b/test/unit/unit-module-name.js similarity index 100% rename from test/tap/unit-module-name.js rename to test/unit/unit-module-name.js diff --git a/test/tap/unit-package-id.js b/test/unit/unit-package-id.js similarity index 100% rename from test/tap/unit-package-id.js rename to test/unit/unit-package-id.js From b4c9f31dfeef3649bb8f9c57e402a635aa30f241 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Wed, 18 Jan 2017 14:51:19 -0800 Subject: [PATCH 3/4] test: Make tests use different test directories --- test/integration/version-sub-directory-shrinkwrap.js | 2 +- test/integration/version-sub-directory.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/version-sub-directory-shrinkwrap.js b/test/integration/version-sub-directory-shrinkwrap.js index 0455b62ab7536..f029a33733f36 100644 --- a/test/integration/version-sub-directory-shrinkwrap.js +++ b/test/integration/version-sub-directory-shrinkwrap.js @@ -9,7 +9,7 @@ var test = require('tap').test var npm = require('../../lib/npm.js') -var pkg = path.resolve(__dirname, 'version-sub-directory') +var pkg = path.resolve(__dirname, path.basename(__filename, '.js')) var subDirectory = path.resolve(pkg, 'sub-directory') var packagePath = path.resolve(pkg, 'package.json') var shrinkwrapPath = path.resolve(pkg, 'npm-shrinkwrap.json') diff --git a/test/integration/version-sub-directory.js b/test/integration/version-sub-directory.js index 71c96121ca7d7..5f4ae5eeb64ea 100644 --- a/test/integration/version-sub-directory.js +++ b/test/integration/version-sub-directory.js @@ -9,7 +9,7 @@ var test = require('tap').test var npm = require('../../lib/npm.js') -var pkg = path.resolve(__dirname, 'version-sub-directory') +var pkg = path.resolve(__dirname, path.basename(__filename, '.js')) var subDirectory = path.resolve(pkg, 'sub-directory') var packagePath = path.resolve(pkg, 'package.json') var cache = path.resolve(pkg, 'cache') From b2c241b70ca7b2634028a68be6c63d4e20a389ed Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Wed, 18 Jan 2017 14:54:16 -0800 Subject: [PATCH 4/4] test: Maybe move more out of tap --- package.json | 2 +- test/{tap => }/00-config-setup.js | 12 ++++++------ test/{tap => integration}/00-verify-bundle-deps.js | 0 test/{tap => integration}/00-verify-ls-ok.js | 0 test/{tap => integration}/add-remote-git-file.js | 0 test/{tap => integration}/bin.js | 0 .../bitbucket-https-url-with-creds-package.js | 0 .../bitbucket-https-url-with-creds.js | 0 .../bitbucket-shortcut-package.js | 0 test/{tap => integration}/bitbucket-shortcut.js | 0 test/{tap => integration}/build-already-built.js | 0 .../bundled-dependencies-nonarray.js | 0 test/{tap => integration}/bundled-dependencies.js | 0 test/{tap => integration}/bundled-no-add-to-move.js | 0 test/{tap => integration}/bundled-transitive-deps.js | 0 test/{tap => integration}/check-cpu-reqs.js | 0 test/{tap => integration}/check-engine-reqs.js | 0 test/{tap => integration}/check-install-self.js | 0 test/{tap => integration}/check-os-reqs.js | 0 test/{tap => integration}/check-permissions.js | 0 test/{tap => integration}/config-basic.js | 2 +- test/{tap => integration}/config-builtin.js | 2 +- test/{tap => integration}/config-certfile.js | 2 +- test/{tap => integration}/config-credentials.js | 2 +- test/{tap => integration}/config-edit.js | 0 test/{tap => integration}/config-list.js | 0 test/{tap => integration}/config-malformed.js | 2 +- test/{tap => integration}/config-meta.js | 0 test/{tap => integration}/config-new-cafile.js | 2 +- test/{tap => integration}/config-private.js | 0 test/{tap => integration}/config-project.js | 2 +- test/{tap => integration}/config-save.js | 2 +- test/{tap => integration}/correct-mkdir.js | 0 test/{tap => integration}/cruft-test.js | 0 test/{tap => integration}/dedupe-scoped.js | 0 .../{tap => integration}/do-not-remove-other-bins.js | 0 .../extraneous-dep-cycle-ls-ok.js | 0 test/{tap => integration}/full-warning-messages.js | 0 test/{tap => integration}/gently-rm-cmdshims.js | 0 test/{tap => integration}/gently-rm-linked-module.js | 0 test/{tap => integration}/gently-rm-overeager.js | 0 .../gently-rm-symlinked-global-dir.js | 0 .../gist-short-shortcut-package.js | 0 test/{tap => integration}/gist-short-shortcut.js | 0 test/{tap => integration}/gist-shortcut-package.js | 0 test/{tap => integration}/gist-shortcut.js | 0 test/{tap => integration}/github-shortcut-package.js | 0 test/{tap => integration}/github-shortcut.js | 0 test/{tap => integration}/gitlab-shortcut-package.js | 0 test/{tap => integration}/gitlab-shortcut.js | 0 .../global-prefix-set-in-userconfig.js | 0 test/{tap => integration}/graceful-restart.js | 0 test/{tap => integration}/ignore-install-link.js | 0 test/{tap => integration}/init-interrupt.js | 0 test/{tap => integration}/install-actions.js | 0 test/{tap => integration}/install-at-locally.js | 0 test/{tap => integration}/install-bad-dep-format.js | 0 test/{tap => integration}/install-bad-man.js | 0 test/{tap => integration}/install-bin-null.js | 0 .../install-cli-only-development.js | 0 .../install-cli-only-production.js | 0 .../install-cli-only-shrinkwrap.js | 0 test/{tap => integration}/install-cli-production.js | 0 test/{tap => integration}/install-from-local.js | 0 .../install-into-likenamed-folder.js | 0 test/{tap => integration}/install-link-scripts.js | 0 test/{tap => integration}/install-local-dep-cycle.js | 0 test/{tap => integration}/install-man.js | 0 test/{tap => integration}/install-order.js | 0 test/{tap => integration}/install-parse-error.js | 0 .../install-property-conflicts.js | 0 .../install-report-just-installed.js | 0 test/{tap => integration}/install-save-local.js | 0 .../install-scoped-already-installed.js | 0 test/{tap => integration}/install-scoped-link.js | 0 .../install-scoped-with-peer-dependency.js | 0 test/{tap => integration}/invalid-cmd-exit-code.js | 0 test/{tap => integration}/is-fs-access-available.js | 0 test/{tap => integration}/legacy-ignore-nested-nm.js | 0 test/{tap => integration}/legacy-missing-bindir.js | 0 test/{tap => integration}/legacy-no-auth-leak.js | 0 test/{tap => integration}/legacy-platform-all.js | 0 test/{tap => integration}/legacy-platform.js | 0 test/{tap => integration}/legacy-private.js | 0 test/{tap => integration}/legacy-test-package.js | 0 test/{tap => integration}/lifecycle-order.js | 0 .../local-args-relative-to-cwd.js | 0 test/{tap => integration}/locker.js | 0 test/{tap => integration}/ls-no-results.js | 0 test/{tap => integration}/ls-top-errors.js | 0 test/{tap => integration}/ls.js | 0 test/{tap => integration}/map-to-registry.js | 0 test/{tap => integration}/nerf-dart.js | 0 test/{tap => integration}/nested-extraneous.js | 0 test/{tap => integration}/no-global-warns.js | 0 test/{tap => integration}/no-scan-full-global-dir.js | 0 test/{tap => integration}/node-modules-path-munge.js | 0 .../normalize-package-explode.js | 0 .../{tap => integration}/npm-api-not-loaded-error.js | 0 test/{tap => integration}/onload.js | 0 test/{tap => integration}/outdated-bad-read-tree.js | 0 test/{tap => integration}/override-bundled.js | 0 .../pick-manifest-from-registry-metadata.js | 0 test/{tap => integration}/progress-config.js | 0 .../publish-access-unscoped-restricted-fails.js | 0 test/{tap => integration}/publish-config.js | 0 test/{tap => integration}/pwd-prefix.js | 0 .../run-script-filter-private.js | 0 test/{tap => integration}/semver-doc.js | 0 test/{tap => integration}/shrinkwrap-lifecycle.js | 0 test/{tap => integration}/shrinkwrap-nested.js | 0 .../shrinkwrap-save-dev-with-existing-deps.js | 0 .../shrinkwrap-save-with-existing-dev-deps.js | 0 .../{tap => integration}/shrinkwrap-version-match.js | 0 test/{tap => integration}/spawn-enoent-help.js | 0 test/{tap => integration}/spawn-enoent.js | 0 .../splat-with-only-prerelease-to-latest.js | 0 test/{tap => integration}/startstop.js | 0 test/{tap => integration}/symlink-cycle.js | 0 test/{tap => integration}/test-run-ls.js | 0 test/{tap => integration}/tree-style.js | 0 test/{tap => integration}/umask-lifecycle.js | 0 test/{tap => integration}/uninstall-in-reverse.js | 0 test/{tap => integration}/uninstall-link-clean.js | 0 test/{tap => integration}/unpublish-config.js | 0 test/{tap => integration}/unsupported.js | 0 test/{tap => integration}/update-path.js | 0 .../verify-no-lifecycle-on-repo.js | 0 test/{tap => integration}/version-no-package.js | 0 test/{integration => tap}/git-npmignore.js | 0 test/{tap => unit}/unit-token-validate-cidr.js | 0 test/{tap => }/zz-cleanup.js | 2 +- 132 files changed, 16 insertions(+), 16 deletions(-) rename test/{tap => }/00-config-setup.js (82%) rename test/{tap => integration}/00-verify-bundle-deps.js (100%) rename test/{tap => integration}/00-verify-ls-ok.js (100%) rename test/{tap => integration}/add-remote-git-file.js (100%) rename test/{tap => integration}/bin.js (100%) rename test/{tap => integration}/bitbucket-https-url-with-creds-package.js (100%) rename test/{tap => integration}/bitbucket-https-url-with-creds.js (100%) rename test/{tap => integration}/bitbucket-shortcut-package.js (100%) rename test/{tap => integration}/bitbucket-shortcut.js (100%) rename test/{tap => integration}/build-already-built.js (100%) rename test/{tap => integration}/bundled-dependencies-nonarray.js (100%) rename test/{tap => integration}/bundled-dependencies.js (100%) rename test/{tap => integration}/bundled-no-add-to-move.js (100%) rename test/{tap => integration}/bundled-transitive-deps.js (100%) rename test/{tap => integration}/check-cpu-reqs.js (100%) rename test/{tap => integration}/check-engine-reqs.js (100%) rename test/{tap => integration}/check-install-self.js (100%) rename test/{tap => integration}/check-os-reqs.js (100%) rename test/{tap => integration}/check-permissions.js (100%) rename test/{tap => integration}/config-basic.js (97%) rename test/{tap => integration}/config-builtin.js (96%) rename test/{tap => integration}/config-certfile.js (93%) rename test/{tap => integration}/config-credentials.js (99%) rename test/{tap => integration}/config-edit.js (100%) rename test/{tap => integration}/config-list.js (100%) rename test/{tap => integration}/config-malformed.js (87%) rename test/{tap => integration}/config-meta.js (100%) rename test/{tap => integration}/config-new-cafile.js (97%) rename test/{tap => integration}/config-private.js (100%) rename test/{tap => integration}/config-project.js (96%) rename test/{tap => integration}/config-save.js (97%) rename test/{tap => integration}/correct-mkdir.js (100%) rename test/{tap => integration}/cruft-test.js (100%) rename test/{tap => integration}/dedupe-scoped.js (100%) rename test/{tap => integration}/do-not-remove-other-bins.js (100%) rename test/{tap => integration}/extraneous-dep-cycle-ls-ok.js (100%) rename test/{tap => integration}/full-warning-messages.js (100%) rename test/{tap => integration}/gently-rm-cmdshims.js (100%) rename test/{tap => integration}/gently-rm-linked-module.js (100%) rename test/{tap => integration}/gently-rm-overeager.js (100%) rename test/{tap => integration}/gently-rm-symlinked-global-dir.js (100%) rename test/{tap => integration}/gist-short-shortcut-package.js (100%) rename test/{tap => integration}/gist-short-shortcut.js (100%) rename test/{tap => integration}/gist-shortcut-package.js (100%) rename test/{tap => integration}/gist-shortcut.js (100%) rename test/{tap => integration}/github-shortcut-package.js (100%) rename test/{tap => integration}/github-shortcut.js (100%) rename test/{tap => integration}/gitlab-shortcut-package.js (100%) rename test/{tap => integration}/gitlab-shortcut.js (100%) rename test/{tap => integration}/global-prefix-set-in-userconfig.js (100%) rename test/{tap => integration}/graceful-restart.js (100%) rename test/{tap => integration}/ignore-install-link.js (100%) rename test/{tap => integration}/init-interrupt.js (100%) rename test/{tap => integration}/install-actions.js (100%) rename test/{tap => integration}/install-at-locally.js (100%) rename test/{tap => integration}/install-bad-dep-format.js (100%) rename test/{tap => integration}/install-bad-man.js (100%) rename test/{tap => integration}/install-bin-null.js (100%) rename test/{tap => integration}/install-cli-only-development.js (100%) rename test/{tap => integration}/install-cli-only-production.js (100%) rename test/{tap => integration}/install-cli-only-shrinkwrap.js (100%) rename test/{tap => integration}/install-cli-production.js (100%) rename test/{tap => integration}/install-from-local.js (100%) rename test/{tap => integration}/install-into-likenamed-folder.js (100%) rename test/{tap => integration}/install-link-scripts.js (100%) rename test/{tap => integration}/install-local-dep-cycle.js (100%) rename test/{tap => integration}/install-man.js (100%) rename test/{tap => integration}/install-order.js (100%) rename test/{tap => integration}/install-parse-error.js (100%) rename test/{tap => integration}/install-property-conflicts.js (100%) rename test/{tap => integration}/install-report-just-installed.js (100%) rename test/{tap => integration}/install-save-local.js (100%) rename test/{tap => integration}/install-scoped-already-installed.js (100%) rename test/{tap => integration}/install-scoped-link.js (100%) rename test/{tap => integration}/install-scoped-with-peer-dependency.js (100%) rename test/{tap => integration}/invalid-cmd-exit-code.js (100%) rename test/{tap => integration}/is-fs-access-available.js (100%) rename test/{tap => integration}/legacy-ignore-nested-nm.js (100%) rename test/{tap => integration}/legacy-missing-bindir.js (100%) rename test/{tap => integration}/legacy-no-auth-leak.js (100%) rename test/{tap => integration}/legacy-platform-all.js (100%) rename test/{tap => integration}/legacy-platform.js (100%) rename test/{tap => integration}/legacy-private.js (100%) rename test/{tap => integration}/legacy-test-package.js (100%) rename test/{tap => integration}/lifecycle-order.js (100%) rename test/{tap => integration}/local-args-relative-to-cwd.js (100%) rename test/{tap => integration}/locker.js (100%) rename test/{tap => integration}/ls-no-results.js (100%) rename test/{tap => integration}/ls-top-errors.js (100%) rename test/{tap => integration}/ls.js (100%) rename test/{tap => integration}/map-to-registry.js (100%) rename test/{tap => integration}/nerf-dart.js (100%) rename test/{tap => integration}/nested-extraneous.js (100%) rename test/{tap => integration}/no-global-warns.js (100%) rename test/{tap => integration}/no-scan-full-global-dir.js (100%) rename test/{tap => integration}/node-modules-path-munge.js (100%) rename test/{tap => integration}/normalize-package-explode.js (100%) rename test/{tap => integration}/npm-api-not-loaded-error.js (100%) rename test/{tap => integration}/onload.js (100%) rename test/{tap => integration}/outdated-bad-read-tree.js (100%) rename test/{tap => integration}/override-bundled.js (100%) rename test/{tap => integration}/pick-manifest-from-registry-metadata.js (100%) rename test/{tap => integration}/progress-config.js (100%) rename test/{tap => integration}/publish-access-unscoped-restricted-fails.js (100%) rename test/{tap => integration}/publish-config.js (100%) rename test/{tap => integration}/pwd-prefix.js (100%) rename test/{tap => integration}/run-script-filter-private.js (100%) rename test/{tap => integration}/semver-doc.js (100%) rename test/{tap => integration}/shrinkwrap-lifecycle.js (100%) rename test/{tap => integration}/shrinkwrap-nested.js (100%) rename test/{tap => integration}/shrinkwrap-save-dev-with-existing-deps.js (100%) rename test/{tap => integration}/shrinkwrap-save-with-existing-dev-deps.js (100%) rename test/{tap => integration}/shrinkwrap-version-match.js (100%) rename test/{tap => integration}/spawn-enoent-help.js (100%) rename test/{tap => integration}/spawn-enoent.js (100%) rename test/{tap => integration}/splat-with-only-prerelease-to-latest.js (100%) rename test/{tap => integration}/startstop.js (100%) rename test/{tap => integration}/symlink-cycle.js (100%) rename test/{tap => integration}/test-run-ls.js (100%) rename test/{tap => integration}/tree-style.js (100%) rename test/{tap => integration}/umask-lifecycle.js (100%) rename test/{tap => integration}/uninstall-in-reverse.js (100%) rename test/{tap => integration}/uninstall-link-clean.js (100%) rename test/{tap => integration}/unpublish-config.js (100%) rename test/{tap => integration}/unsupported.js (100%) rename test/{tap => integration}/update-path.js (100%) rename test/{tap => integration}/verify-no-lifecycle-on-repo.js (100%) rename test/{tap => integration}/version-no-package.js (100%) rename test/{integration => tap}/git-npmignore.js (100%) rename test/{tap => unit}/unit-token-validate-cidr.js (100%) rename test/{tap => }/zz-cleanup.js (79%) diff --git a/package.json b/package.json index 90ac2c127fdcd..9d88d598216d2 100644 --- a/package.json +++ b/package.json @@ -281,7 +281,7 @@ "tap-cover": "tap --reporter=classic --nyc-arg='--cache' --coverage --timeout 600", "test": "standard && npm run test-tap", "test-coverage": "npm run tap-cover -- \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"", - "test-tap": "npm run tap -- \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"", + "test-tap": "npm run tap -- \"test/unit/*.js\" \"test/integration/*.js\" \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-*/*.js\"", "test-node": "tap --timeout 240 \"test/tap/*.js\" \"test/network/*.js\" \"test/broken-under-nyc*/*.js\"" }, "license": "Artistic-2.0" diff --git a/test/tap/00-config-setup.js b/test/00-config-setup.js similarity index 82% rename from test/tap/00-config-setup.js rename to test/00-config-setup.js index 448453eded4fd..03ac0c1f29c45 100644 --- a/test/tap/00-config-setup.js +++ b/test/00-config-setup.js @@ -1,10 +1,10 @@ var fs = require('graceful-fs') var path = require('path') -var userconfigSrc = path.resolve(__dirname, '..', 'fixtures', 'config', 'userconfig') +var userconfigSrc = path.resolve(__dirname, 'fixtures', 'config', 'userconfig') exports.userconfig = userconfigSrc + '-with-gc' -exports.globalconfig = path.resolve(__dirname, '..', 'fixtures', 'config', 'globalconfig') -exports.builtin = path.resolve(__dirname, '..', 'fixtures', 'config', 'builtin') -exports.malformed = path.resolve(__dirname, '..', 'fixtures', 'config', 'malformed') +exports.globalconfig = path.resolve(__dirname, 'fixtures', 'config', 'globalconfig') +exports.builtin = path.resolve(__dirname, 'fixtures', 'config', 'builtin') +exports.malformed = path.resolve(__dirname, 'fixtures', 'config', 'malformed') exports.ucData = { globalconfig: exports.globalconfig, email: 'i@izs.me', @@ -55,7 +55,7 @@ exports.envDataFix = { 'other-env-thing': 1000 } -var projectConf = path.resolve(__dirname, '..', '..', '.npmrc') +var projectConf = path.resolve(__dirname, '..', '.npmrc') try { fs.statSync(projectConf) } catch (er) { @@ -66,7 +66,7 @@ legacy-bundling = true */ }.toString().split('\n').slice(1, -1).join('\n')) } -var projectRc = path.join(__dirname, '..', 'fixtures', 'config', '.npmrc') +var projectRc = path.join(__dirname, 'fixtures', 'config', '.npmrc') try { fs.statSync(projectRc) } catch (er) { diff --git a/test/tap/00-verify-bundle-deps.js b/test/integration/00-verify-bundle-deps.js similarity index 100% rename from test/tap/00-verify-bundle-deps.js rename to test/integration/00-verify-bundle-deps.js diff --git a/test/tap/00-verify-ls-ok.js b/test/integration/00-verify-ls-ok.js similarity index 100% rename from test/tap/00-verify-ls-ok.js rename to test/integration/00-verify-ls-ok.js diff --git a/test/tap/add-remote-git-file.js b/test/integration/add-remote-git-file.js similarity index 100% rename from test/tap/add-remote-git-file.js rename to test/integration/add-remote-git-file.js diff --git a/test/tap/bin.js b/test/integration/bin.js similarity index 100% rename from test/tap/bin.js rename to test/integration/bin.js diff --git a/test/tap/bitbucket-https-url-with-creds-package.js b/test/integration/bitbucket-https-url-with-creds-package.js similarity index 100% rename from test/tap/bitbucket-https-url-with-creds-package.js rename to test/integration/bitbucket-https-url-with-creds-package.js diff --git a/test/tap/bitbucket-https-url-with-creds.js b/test/integration/bitbucket-https-url-with-creds.js similarity index 100% rename from test/tap/bitbucket-https-url-with-creds.js rename to test/integration/bitbucket-https-url-with-creds.js diff --git a/test/tap/bitbucket-shortcut-package.js b/test/integration/bitbucket-shortcut-package.js similarity index 100% rename from test/tap/bitbucket-shortcut-package.js rename to test/integration/bitbucket-shortcut-package.js diff --git a/test/tap/bitbucket-shortcut.js b/test/integration/bitbucket-shortcut.js similarity index 100% rename from test/tap/bitbucket-shortcut.js rename to test/integration/bitbucket-shortcut.js diff --git a/test/tap/build-already-built.js b/test/integration/build-already-built.js similarity index 100% rename from test/tap/build-already-built.js rename to test/integration/build-already-built.js diff --git a/test/tap/bundled-dependencies-nonarray.js b/test/integration/bundled-dependencies-nonarray.js similarity index 100% rename from test/tap/bundled-dependencies-nonarray.js rename to test/integration/bundled-dependencies-nonarray.js diff --git a/test/tap/bundled-dependencies.js b/test/integration/bundled-dependencies.js similarity index 100% rename from test/tap/bundled-dependencies.js rename to test/integration/bundled-dependencies.js diff --git a/test/tap/bundled-no-add-to-move.js b/test/integration/bundled-no-add-to-move.js similarity index 100% rename from test/tap/bundled-no-add-to-move.js rename to test/integration/bundled-no-add-to-move.js diff --git a/test/tap/bundled-transitive-deps.js b/test/integration/bundled-transitive-deps.js similarity index 100% rename from test/tap/bundled-transitive-deps.js rename to test/integration/bundled-transitive-deps.js diff --git a/test/tap/check-cpu-reqs.js b/test/integration/check-cpu-reqs.js similarity index 100% rename from test/tap/check-cpu-reqs.js rename to test/integration/check-cpu-reqs.js diff --git a/test/tap/check-engine-reqs.js b/test/integration/check-engine-reqs.js similarity index 100% rename from test/tap/check-engine-reqs.js rename to test/integration/check-engine-reqs.js diff --git a/test/tap/check-install-self.js b/test/integration/check-install-self.js similarity index 100% rename from test/tap/check-install-self.js rename to test/integration/check-install-self.js diff --git a/test/tap/check-os-reqs.js b/test/integration/check-os-reqs.js similarity index 100% rename from test/tap/check-os-reqs.js rename to test/integration/check-os-reqs.js diff --git a/test/tap/check-permissions.js b/test/integration/check-permissions.js similarity index 100% rename from test/tap/check-permissions.js rename to test/integration/check-permissions.js diff --git a/test/tap/config-basic.js b/test/integration/config-basic.js similarity index 97% rename from test/tap/config-basic.js rename to test/integration/config-basic.js index 139b8e92f8a5b..e77b8c19c2c0f 100644 --- a/test/tap/config-basic.js +++ b/test/integration/config-basic.js @@ -1,6 +1,6 @@ var test = require('tap').test var npmconf = require('../../lib/config/core.js') -var common = require('./00-config-setup.js') +var common = require('../00-config-setup.js') var path = require('path') var projectData = { diff --git a/test/tap/config-builtin.js b/test/integration/config-builtin.js similarity index 96% rename from test/tap/config-builtin.js rename to test/integration/config-builtin.js index 885d099a1fc30..00fbd87f9f78e 100644 --- a/test/tap/config-builtin.js +++ b/test/integration/config-builtin.js @@ -1,6 +1,6 @@ var test = require('tap').test var npmconf = require('../../lib/config/core.js') -var common = require('./00-config-setup.js') +var common = require('../00-config-setup.js') var path = require('path') var ucData = common.ucData diff --git a/test/tap/config-certfile.js b/test/integration/config-certfile.js similarity index 93% rename from test/tap/config-certfile.js rename to test/integration/config-certfile.js index 4b960672ad79e..9258edd48e994 100644 --- a/test/tap/config-certfile.js +++ b/test/integration/config-certfile.js @@ -1,4 +1,4 @@ -require('./00-config-setup.js') +require('../00-config-setup.js') var path = require('path') var fs = require('fs') diff --git a/test/tap/config-credentials.js b/test/integration/config-credentials.js similarity index 99% rename from test/tap/config-credentials.js rename to test/integration/config-credentials.js index f6f00ee0e6518..e2862ccc4b13d 100644 --- a/test/tap/config-credentials.js +++ b/test/integration/config-credentials.js @@ -1,7 +1,7 @@ var test = require('tap').test var npmconf = require('../../lib/config/core.js') -var common = require('./00-config-setup.js') +var common = require('../00-config-setup.js') var URI = 'https://registry.lvh.me:8661/' diff --git a/test/tap/config-edit.js b/test/integration/config-edit.js similarity index 100% rename from test/tap/config-edit.js rename to test/integration/config-edit.js diff --git a/test/tap/config-list.js b/test/integration/config-list.js similarity index 100% rename from test/tap/config-list.js rename to test/integration/config-list.js diff --git a/test/tap/config-malformed.js b/test/integration/config-malformed.js similarity index 87% rename from test/tap/config-malformed.js rename to test/integration/config-malformed.js index 4f74ea5387e59..2904ac584cd1d 100644 --- a/test/tap/config-malformed.js +++ b/test/integration/config-malformed.js @@ -1,7 +1,7 @@ var test = require('tap').test var npmconf = require('../../lib/config/core.js') -var common = require('./00-config-setup.js') +var common = require('../00-config-setup.js') test('with malformed', function (t) { npmconf.load({}, common.malformed, function (er, conf) { diff --git a/test/tap/config-meta.js b/test/integration/config-meta.js similarity index 100% rename from test/tap/config-meta.js rename to test/integration/config-meta.js diff --git a/test/tap/config-new-cafile.js b/test/integration/config-new-cafile.js similarity index 97% rename from test/tap/config-new-cafile.js rename to test/integration/config-new-cafile.js index 9cffb19008ed4..5d515b46c64b3 100644 --- a/test/tap/config-new-cafile.js +++ b/test/integration/config-new-cafile.js @@ -1,4 +1,4 @@ -require('./00-config-setup.js') +require('../00-config-setup.js') var path = require('path') var fs = require('graceful-fs') diff --git a/test/tap/config-private.js b/test/integration/config-private.js similarity index 100% rename from test/tap/config-private.js rename to test/integration/config-private.js diff --git a/test/tap/config-project.js b/test/integration/config-project.js similarity index 96% rename from test/tap/config-project.js rename to test/integration/config-project.js index b9e8b7ac04a2e..9da7f37e3d0d5 100644 --- a/test/tap/config-project.js +++ b/test/integration/config-project.js @@ -3,7 +3,7 @@ var path = require('path') var fix = path.resolve(__dirname, '..', 'fixtures', 'config') var projectRc = path.resolve(fix, '.npmrc') var npmconf = require('../../lib/config/core.js') -var common = require('./00-config-setup.js') +var common = require('../00-config-setup.js') var projectData = { just: 'testing' } diff --git a/test/tap/config-save.js b/test/integration/config-save.js similarity index 97% rename from test/tap/config-save.js rename to test/integration/config-save.js index a7f85d6015e4b..989342ed5edef 100644 --- a/test/tap/config-save.js +++ b/test/integration/config-save.js @@ -2,7 +2,7 @@ var fs = require('fs') var ini = require('ini') var test = require('tap').test var npmconf = require('../../lib/config/core.js') -var common = require('./00-config-setup.js') +var common = require('../00-config-setup.js') var expectConf = [ 'globalconfig = ' + common.globalconfig, diff --git a/test/tap/correct-mkdir.js b/test/integration/correct-mkdir.js similarity index 100% rename from test/tap/correct-mkdir.js rename to test/integration/correct-mkdir.js diff --git a/test/tap/cruft-test.js b/test/integration/cruft-test.js similarity index 100% rename from test/tap/cruft-test.js rename to test/integration/cruft-test.js diff --git a/test/tap/dedupe-scoped.js b/test/integration/dedupe-scoped.js similarity index 100% rename from test/tap/dedupe-scoped.js rename to test/integration/dedupe-scoped.js diff --git a/test/tap/do-not-remove-other-bins.js b/test/integration/do-not-remove-other-bins.js similarity index 100% rename from test/tap/do-not-remove-other-bins.js rename to test/integration/do-not-remove-other-bins.js diff --git a/test/tap/extraneous-dep-cycle-ls-ok.js b/test/integration/extraneous-dep-cycle-ls-ok.js similarity index 100% rename from test/tap/extraneous-dep-cycle-ls-ok.js rename to test/integration/extraneous-dep-cycle-ls-ok.js diff --git a/test/tap/full-warning-messages.js b/test/integration/full-warning-messages.js similarity index 100% rename from test/tap/full-warning-messages.js rename to test/integration/full-warning-messages.js diff --git a/test/tap/gently-rm-cmdshims.js b/test/integration/gently-rm-cmdshims.js similarity index 100% rename from test/tap/gently-rm-cmdshims.js rename to test/integration/gently-rm-cmdshims.js diff --git a/test/tap/gently-rm-linked-module.js b/test/integration/gently-rm-linked-module.js similarity index 100% rename from test/tap/gently-rm-linked-module.js rename to test/integration/gently-rm-linked-module.js diff --git a/test/tap/gently-rm-overeager.js b/test/integration/gently-rm-overeager.js similarity index 100% rename from test/tap/gently-rm-overeager.js rename to test/integration/gently-rm-overeager.js diff --git a/test/tap/gently-rm-symlinked-global-dir.js b/test/integration/gently-rm-symlinked-global-dir.js similarity index 100% rename from test/tap/gently-rm-symlinked-global-dir.js rename to test/integration/gently-rm-symlinked-global-dir.js diff --git a/test/tap/gist-short-shortcut-package.js b/test/integration/gist-short-shortcut-package.js similarity index 100% rename from test/tap/gist-short-shortcut-package.js rename to test/integration/gist-short-shortcut-package.js diff --git a/test/tap/gist-short-shortcut.js b/test/integration/gist-short-shortcut.js similarity index 100% rename from test/tap/gist-short-shortcut.js rename to test/integration/gist-short-shortcut.js diff --git a/test/tap/gist-shortcut-package.js b/test/integration/gist-shortcut-package.js similarity index 100% rename from test/tap/gist-shortcut-package.js rename to test/integration/gist-shortcut-package.js diff --git a/test/tap/gist-shortcut.js b/test/integration/gist-shortcut.js similarity index 100% rename from test/tap/gist-shortcut.js rename to test/integration/gist-shortcut.js diff --git a/test/tap/github-shortcut-package.js b/test/integration/github-shortcut-package.js similarity index 100% rename from test/tap/github-shortcut-package.js rename to test/integration/github-shortcut-package.js diff --git a/test/tap/github-shortcut.js b/test/integration/github-shortcut.js similarity index 100% rename from test/tap/github-shortcut.js rename to test/integration/github-shortcut.js diff --git a/test/tap/gitlab-shortcut-package.js b/test/integration/gitlab-shortcut-package.js similarity index 100% rename from test/tap/gitlab-shortcut-package.js rename to test/integration/gitlab-shortcut-package.js diff --git a/test/tap/gitlab-shortcut.js b/test/integration/gitlab-shortcut.js similarity index 100% rename from test/tap/gitlab-shortcut.js rename to test/integration/gitlab-shortcut.js diff --git a/test/tap/global-prefix-set-in-userconfig.js b/test/integration/global-prefix-set-in-userconfig.js similarity index 100% rename from test/tap/global-prefix-set-in-userconfig.js rename to test/integration/global-prefix-set-in-userconfig.js diff --git a/test/tap/graceful-restart.js b/test/integration/graceful-restart.js similarity index 100% rename from test/tap/graceful-restart.js rename to test/integration/graceful-restart.js diff --git a/test/tap/ignore-install-link.js b/test/integration/ignore-install-link.js similarity index 100% rename from test/tap/ignore-install-link.js rename to test/integration/ignore-install-link.js diff --git a/test/tap/init-interrupt.js b/test/integration/init-interrupt.js similarity index 100% rename from test/tap/init-interrupt.js rename to test/integration/init-interrupt.js diff --git a/test/tap/install-actions.js b/test/integration/install-actions.js similarity index 100% rename from test/tap/install-actions.js rename to test/integration/install-actions.js diff --git a/test/tap/install-at-locally.js b/test/integration/install-at-locally.js similarity index 100% rename from test/tap/install-at-locally.js rename to test/integration/install-at-locally.js diff --git a/test/tap/install-bad-dep-format.js b/test/integration/install-bad-dep-format.js similarity index 100% rename from test/tap/install-bad-dep-format.js rename to test/integration/install-bad-dep-format.js diff --git a/test/tap/install-bad-man.js b/test/integration/install-bad-man.js similarity index 100% rename from test/tap/install-bad-man.js rename to test/integration/install-bad-man.js diff --git a/test/tap/install-bin-null.js b/test/integration/install-bin-null.js similarity index 100% rename from test/tap/install-bin-null.js rename to test/integration/install-bin-null.js diff --git a/test/tap/install-cli-only-development.js b/test/integration/install-cli-only-development.js similarity index 100% rename from test/tap/install-cli-only-development.js rename to test/integration/install-cli-only-development.js diff --git a/test/tap/install-cli-only-production.js b/test/integration/install-cli-only-production.js similarity index 100% rename from test/tap/install-cli-only-production.js rename to test/integration/install-cli-only-production.js diff --git a/test/tap/install-cli-only-shrinkwrap.js b/test/integration/install-cli-only-shrinkwrap.js similarity index 100% rename from test/tap/install-cli-only-shrinkwrap.js rename to test/integration/install-cli-only-shrinkwrap.js diff --git a/test/tap/install-cli-production.js b/test/integration/install-cli-production.js similarity index 100% rename from test/tap/install-cli-production.js rename to test/integration/install-cli-production.js diff --git a/test/tap/install-from-local.js b/test/integration/install-from-local.js similarity index 100% rename from test/tap/install-from-local.js rename to test/integration/install-from-local.js diff --git a/test/tap/install-into-likenamed-folder.js b/test/integration/install-into-likenamed-folder.js similarity index 100% rename from test/tap/install-into-likenamed-folder.js rename to test/integration/install-into-likenamed-folder.js diff --git a/test/tap/install-link-scripts.js b/test/integration/install-link-scripts.js similarity index 100% rename from test/tap/install-link-scripts.js rename to test/integration/install-link-scripts.js diff --git a/test/tap/install-local-dep-cycle.js b/test/integration/install-local-dep-cycle.js similarity index 100% rename from test/tap/install-local-dep-cycle.js rename to test/integration/install-local-dep-cycle.js diff --git a/test/tap/install-man.js b/test/integration/install-man.js similarity index 100% rename from test/tap/install-man.js rename to test/integration/install-man.js diff --git a/test/tap/install-order.js b/test/integration/install-order.js similarity index 100% rename from test/tap/install-order.js rename to test/integration/install-order.js diff --git a/test/tap/install-parse-error.js b/test/integration/install-parse-error.js similarity index 100% rename from test/tap/install-parse-error.js rename to test/integration/install-parse-error.js diff --git a/test/tap/install-property-conflicts.js b/test/integration/install-property-conflicts.js similarity index 100% rename from test/tap/install-property-conflicts.js rename to test/integration/install-property-conflicts.js diff --git a/test/tap/install-report-just-installed.js b/test/integration/install-report-just-installed.js similarity index 100% rename from test/tap/install-report-just-installed.js rename to test/integration/install-report-just-installed.js diff --git a/test/tap/install-save-local.js b/test/integration/install-save-local.js similarity index 100% rename from test/tap/install-save-local.js rename to test/integration/install-save-local.js diff --git a/test/tap/install-scoped-already-installed.js b/test/integration/install-scoped-already-installed.js similarity index 100% rename from test/tap/install-scoped-already-installed.js rename to test/integration/install-scoped-already-installed.js diff --git a/test/tap/install-scoped-link.js b/test/integration/install-scoped-link.js similarity index 100% rename from test/tap/install-scoped-link.js rename to test/integration/install-scoped-link.js diff --git a/test/tap/install-scoped-with-peer-dependency.js b/test/integration/install-scoped-with-peer-dependency.js similarity index 100% rename from test/tap/install-scoped-with-peer-dependency.js rename to test/integration/install-scoped-with-peer-dependency.js diff --git a/test/tap/invalid-cmd-exit-code.js b/test/integration/invalid-cmd-exit-code.js similarity index 100% rename from test/tap/invalid-cmd-exit-code.js rename to test/integration/invalid-cmd-exit-code.js diff --git a/test/tap/is-fs-access-available.js b/test/integration/is-fs-access-available.js similarity index 100% rename from test/tap/is-fs-access-available.js rename to test/integration/is-fs-access-available.js diff --git a/test/tap/legacy-ignore-nested-nm.js b/test/integration/legacy-ignore-nested-nm.js similarity index 100% rename from test/tap/legacy-ignore-nested-nm.js rename to test/integration/legacy-ignore-nested-nm.js diff --git a/test/tap/legacy-missing-bindir.js b/test/integration/legacy-missing-bindir.js similarity index 100% rename from test/tap/legacy-missing-bindir.js rename to test/integration/legacy-missing-bindir.js diff --git a/test/tap/legacy-no-auth-leak.js b/test/integration/legacy-no-auth-leak.js similarity index 100% rename from test/tap/legacy-no-auth-leak.js rename to test/integration/legacy-no-auth-leak.js diff --git a/test/tap/legacy-platform-all.js b/test/integration/legacy-platform-all.js similarity index 100% rename from test/tap/legacy-platform-all.js rename to test/integration/legacy-platform-all.js diff --git a/test/tap/legacy-platform.js b/test/integration/legacy-platform.js similarity index 100% rename from test/tap/legacy-platform.js rename to test/integration/legacy-platform.js diff --git a/test/tap/legacy-private.js b/test/integration/legacy-private.js similarity index 100% rename from test/tap/legacy-private.js rename to test/integration/legacy-private.js diff --git a/test/tap/legacy-test-package.js b/test/integration/legacy-test-package.js similarity index 100% rename from test/tap/legacy-test-package.js rename to test/integration/legacy-test-package.js diff --git a/test/tap/lifecycle-order.js b/test/integration/lifecycle-order.js similarity index 100% rename from test/tap/lifecycle-order.js rename to test/integration/lifecycle-order.js diff --git a/test/tap/local-args-relative-to-cwd.js b/test/integration/local-args-relative-to-cwd.js similarity index 100% rename from test/tap/local-args-relative-to-cwd.js rename to test/integration/local-args-relative-to-cwd.js diff --git a/test/tap/locker.js b/test/integration/locker.js similarity index 100% rename from test/tap/locker.js rename to test/integration/locker.js diff --git a/test/tap/ls-no-results.js b/test/integration/ls-no-results.js similarity index 100% rename from test/tap/ls-no-results.js rename to test/integration/ls-no-results.js diff --git a/test/tap/ls-top-errors.js b/test/integration/ls-top-errors.js similarity index 100% rename from test/tap/ls-top-errors.js rename to test/integration/ls-top-errors.js diff --git a/test/tap/ls.js b/test/integration/ls.js similarity index 100% rename from test/tap/ls.js rename to test/integration/ls.js diff --git a/test/tap/map-to-registry.js b/test/integration/map-to-registry.js similarity index 100% rename from test/tap/map-to-registry.js rename to test/integration/map-to-registry.js diff --git a/test/tap/nerf-dart.js b/test/integration/nerf-dart.js similarity index 100% rename from test/tap/nerf-dart.js rename to test/integration/nerf-dart.js diff --git a/test/tap/nested-extraneous.js b/test/integration/nested-extraneous.js similarity index 100% rename from test/tap/nested-extraneous.js rename to test/integration/nested-extraneous.js diff --git a/test/tap/no-global-warns.js b/test/integration/no-global-warns.js similarity index 100% rename from test/tap/no-global-warns.js rename to test/integration/no-global-warns.js diff --git a/test/tap/no-scan-full-global-dir.js b/test/integration/no-scan-full-global-dir.js similarity index 100% rename from test/tap/no-scan-full-global-dir.js rename to test/integration/no-scan-full-global-dir.js diff --git a/test/tap/node-modules-path-munge.js b/test/integration/node-modules-path-munge.js similarity index 100% rename from test/tap/node-modules-path-munge.js rename to test/integration/node-modules-path-munge.js diff --git a/test/tap/normalize-package-explode.js b/test/integration/normalize-package-explode.js similarity index 100% rename from test/tap/normalize-package-explode.js rename to test/integration/normalize-package-explode.js diff --git a/test/tap/npm-api-not-loaded-error.js b/test/integration/npm-api-not-loaded-error.js similarity index 100% rename from test/tap/npm-api-not-loaded-error.js rename to test/integration/npm-api-not-loaded-error.js diff --git a/test/tap/onload.js b/test/integration/onload.js similarity index 100% rename from test/tap/onload.js rename to test/integration/onload.js diff --git a/test/tap/outdated-bad-read-tree.js b/test/integration/outdated-bad-read-tree.js similarity index 100% rename from test/tap/outdated-bad-read-tree.js rename to test/integration/outdated-bad-read-tree.js diff --git a/test/tap/override-bundled.js b/test/integration/override-bundled.js similarity index 100% rename from test/tap/override-bundled.js rename to test/integration/override-bundled.js diff --git a/test/tap/pick-manifest-from-registry-metadata.js b/test/integration/pick-manifest-from-registry-metadata.js similarity index 100% rename from test/tap/pick-manifest-from-registry-metadata.js rename to test/integration/pick-manifest-from-registry-metadata.js diff --git a/test/tap/progress-config.js b/test/integration/progress-config.js similarity index 100% rename from test/tap/progress-config.js rename to test/integration/progress-config.js diff --git a/test/tap/publish-access-unscoped-restricted-fails.js b/test/integration/publish-access-unscoped-restricted-fails.js similarity index 100% rename from test/tap/publish-access-unscoped-restricted-fails.js rename to test/integration/publish-access-unscoped-restricted-fails.js diff --git a/test/tap/publish-config.js b/test/integration/publish-config.js similarity index 100% rename from test/tap/publish-config.js rename to test/integration/publish-config.js diff --git a/test/tap/pwd-prefix.js b/test/integration/pwd-prefix.js similarity index 100% rename from test/tap/pwd-prefix.js rename to test/integration/pwd-prefix.js diff --git a/test/tap/run-script-filter-private.js b/test/integration/run-script-filter-private.js similarity index 100% rename from test/tap/run-script-filter-private.js rename to test/integration/run-script-filter-private.js diff --git a/test/tap/semver-doc.js b/test/integration/semver-doc.js similarity index 100% rename from test/tap/semver-doc.js rename to test/integration/semver-doc.js diff --git a/test/tap/shrinkwrap-lifecycle.js b/test/integration/shrinkwrap-lifecycle.js similarity index 100% rename from test/tap/shrinkwrap-lifecycle.js rename to test/integration/shrinkwrap-lifecycle.js diff --git a/test/tap/shrinkwrap-nested.js b/test/integration/shrinkwrap-nested.js similarity index 100% rename from test/tap/shrinkwrap-nested.js rename to test/integration/shrinkwrap-nested.js diff --git a/test/tap/shrinkwrap-save-dev-with-existing-deps.js b/test/integration/shrinkwrap-save-dev-with-existing-deps.js similarity index 100% rename from test/tap/shrinkwrap-save-dev-with-existing-deps.js rename to test/integration/shrinkwrap-save-dev-with-existing-deps.js diff --git a/test/tap/shrinkwrap-save-with-existing-dev-deps.js b/test/integration/shrinkwrap-save-with-existing-dev-deps.js similarity index 100% rename from test/tap/shrinkwrap-save-with-existing-dev-deps.js rename to test/integration/shrinkwrap-save-with-existing-dev-deps.js diff --git a/test/tap/shrinkwrap-version-match.js b/test/integration/shrinkwrap-version-match.js similarity index 100% rename from test/tap/shrinkwrap-version-match.js rename to test/integration/shrinkwrap-version-match.js diff --git a/test/tap/spawn-enoent-help.js b/test/integration/spawn-enoent-help.js similarity index 100% rename from test/tap/spawn-enoent-help.js rename to test/integration/spawn-enoent-help.js diff --git a/test/tap/spawn-enoent.js b/test/integration/spawn-enoent.js similarity index 100% rename from test/tap/spawn-enoent.js rename to test/integration/spawn-enoent.js diff --git a/test/tap/splat-with-only-prerelease-to-latest.js b/test/integration/splat-with-only-prerelease-to-latest.js similarity index 100% rename from test/tap/splat-with-only-prerelease-to-latest.js rename to test/integration/splat-with-only-prerelease-to-latest.js diff --git a/test/tap/startstop.js b/test/integration/startstop.js similarity index 100% rename from test/tap/startstop.js rename to test/integration/startstop.js diff --git a/test/tap/symlink-cycle.js b/test/integration/symlink-cycle.js similarity index 100% rename from test/tap/symlink-cycle.js rename to test/integration/symlink-cycle.js diff --git a/test/tap/test-run-ls.js b/test/integration/test-run-ls.js similarity index 100% rename from test/tap/test-run-ls.js rename to test/integration/test-run-ls.js diff --git a/test/tap/tree-style.js b/test/integration/tree-style.js similarity index 100% rename from test/tap/tree-style.js rename to test/integration/tree-style.js diff --git a/test/tap/umask-lifecycle.js b/test/integration/umask-lifecycle.js similarity index 100% rename from test/tap/umask-lifecycle.js rename to test/integration/umask-lifecycle.js diff --git a/test/tap/uninstall-in-reverse.js b/test/integration/uninstall-in-reverse.js similarity index 100% rename from test/tap/uninstall-in-reverse.js rename to test/integration/uninstall-in-reverse.js diff --git a/test/tap/uninstall-link-clean.js b/test/integration/uninstall-link-clean.js similarity index 100% rename from test/tap/uninstall-link-clean.js rename to test/integration/uninstall-link-clean.js diff --git a/test/tap/unpublish-config.js b/test/integration/unpublish-config.js similarity index 100% rename from test/tap/unpublish-config.js rename to test/integration/unpublish-config.js diff --git a/test/tap/unsupported.js b/test/integration/unsupported.js similarity index 100% rename from test/tap/unsupported.js rename to test/integration/unsupported.js diff --git a/test/tap/update-path.js b/test/integration/update-path.js similarity index 100% rename from test/tap/update-path.js rename to test/integration/update-path.js diff --git a/test/tap/verify-no-lifecycle-on-repo.js b/test/integration/verify-no-lifecycle-on-repo.js similarity index 100% rename from test/tap/verify-no-lifecycle-on-repo.js rename to test/integration/verify-no-lifecycle-on-repo.js diff --git a/test/tap/version-no-package.js b/test/integration/version-no-package.js similarity index 100% rename from test/tap/version-no-package.js rename to test/integration/version-no-package.js diff --git a/test/integration/git-npmignore.js b/test/tap/git-npmignore.js similarity index 100% rename from test/integration/git-npmignore.js rename to test/tap/git-npmignore.js diff --git a/test/tap/unit-token-validate-cidr.js b/test/unit/unit-token-validate-cidr.js similarity index 100% rename from test/tap/unit-token-validate-cidr.js rename to test/unit/unit-token-validate-cidr.js diff --git a/test/tap/zz-cleanup.js b/test/zz-cleanup.js similarity index 79% rename from test/tap/zz-cleanup.js rename to test/zz-cleanup.js index e1020aa3b11b5..a0886a2a828e8 100644 --- a/test/tap/zz-cleanup.js +++ b/test/zz-cleanup.js @@ -1,4 +1,4 @@ -var common = require('../common-tap') +var common = require('./common-tap') var test = require('tap').test var rimraf = require('rimraf')