Test renovation for 1.0.

TODO: tap output

33 files changed, 30 insertions, 179 deletions

diff --git a/test/packages/npm-test-bindir/bin/prog.js b/test/packages/npm-test-bindir/bin/prog.js
deleted file mode 100755
index 96edaddf3..000000000
--- a/test/packages/npm-test-bindir/bin/prog.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-console.log("hello from bindir")
diff --git a/test/packages/npm-test-bindir/package.json b/test/packages/npm-test-bindir/package.json
deleted file mode 100644
index a6d1a6aad..000000000
--- a/test/packages/npm-test-bindir/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "name" : "npm-test-bindir"
-, "version" : "1.0.0"
-, "directories" : { "bin" : "./bin" }
-, "scripts" : { "test" : "node ./test.js" }
-}
diff --git a/test/packages/npm-test-bindir/test.js b/test/packages/npm-test-bindir/test.js
deleted file mode 100755
index 8f28ad867..000000000
--- a/test/packages/npm-test-bindir/test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// ${npm_config_binroot}/prog @ -> ./prog-${npm_package_version}
-// ${npm_config_binroot}/prog-${npm_package_version} = shim
-
-var path = require("path")
-  , assert = require("assert")
-  , root = process.env.npm_config_root
-  , binroot = process.env.npm_config_binroot
-  , name = process.env.npm_package_name
-  , version = process.env.npm_package_version
-  , prog = path.join(binroot, "prog")
-  , progVer = path.join(binroot, "prog@"+version)
-  , bin = path.join(root, ".npm", name, version, "package", "bin", "prog.js")
-
-assert.equal(require(bin), require(progVer), "require('"+ bin +"') !== require('"+ progVer +"')")
-assert.equal(require(prog), require(progVer), "require('"+ prog +"') !== require('"+ progVer +"')")
-assert.equal(require(bin), require(prog), "require('"+ bin +"') !== require('"+ prog +"')")
diff --git a/test/packages/npm-test-bundletest/foo.js b/test/packages/npm-test-bundletest/foo.js
deleted file mode 100644
index 251ae9bcc..000000000
--- a/test/packages/npm-test-bundletest/foo.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var assert = require("assert")
-  , path = require("path")
-  , pkgdir = path.join(__dirname, "node_modules")
-  , fs = require("fs")
-  , json = fs.readFileSync(path.join(__dirname, "package.json"),"utf8")
-  , pkg = JSON.parse(json)
-  , deps = Object.keys(pkg.dependencies)
-
-deps.forEach(function (dep) {
-  var d = require.resolve(dep)
-  assert.equal(0, d.indexOf(pkgdir)
-              ,dep+" not in "+pkgdir+"\nFound at "+d)
-})
diff --git a/test/packages/npm-test-bundletest/package.json b/test/packages/npm-test-bundletest/package.json
deleted file mode 100644
index e260ce847..000000000
--- a/test/packages/npm-test-bundletest/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"name":"npm-test-bundletest"
-,"version":"1.0.0"
-,"main":"./foo"
-,"dependencies":{"express":"1.0.0","oauth":"*","ejs":"0.2.0","npm":"*"}
-,"scripts":{"test":"node foo.js"}}
diff --git a/test/packages/npm-test-depends-on-connect/package.json b/test/packages/npm-test-depends-on-connect/package.json
deleted file mode 100644
index 7a40ddc3f..000000000
--- a/test/packages/npm-test-depends-on-connect/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "name":"npm-test-depends-on-connect"
-, "version" : "1.2.3"
-, "dependencies" : { "connect" : "0.2.4" }
-}
diff --git a/test/packages/npm-test-depends-on-jsdom/package.json b/test/packages/npm-test-depends-on-jsdom/package.json
deleted file mode 100644
index c22917daf..000000000
--- a/test/packages/npm-test-depends-on-jsdom/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "name":"npm-test-depends-on-jsdom"
-, "version" : "1.0.0"
-, "dependencies" : { "jsdom" : "*" }
-, "scripts" : { "test" : "node test.js" }
-}
diff --git a/test/packages/npm-test-depends-on-jsdom/test.js b/test/packages/npm-test-depends-on-jsdom/test.js
deleted file mode 100644
index 359830004..000000000
--- a/test/packages/npm-test-depends-on-jsdom/test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-require.paths.unshift
-  ( "./node_modules"
-  , "../node_modules"
-  , "../../node_modules"
-  , "../../../node_modules"
-  , "../../../../node_modules"
-  , "../../../../../node_modules"
-  , "../../../../../../node_modules"
-  , "../../../../../../../node_modules"
-  , "../../../../../../../../node_modules")
-
-require("jsdom")
-require("htmlparser")
diff --git a/test/packages/npm-test-depends-on-spark/package.json b/test/packages/npm-test-depends-on-spark/package.json
deleted file mode 100644
index a6ed7f062..000000000
--- a/test/packages/npm-test-depends-on-spark/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"name":"npm-test-depends-on-spark"
-,"version":"1.2.3"
-,"dependencies":{"spark":"*"}
-,"scripts":{"test":"echo $PATH >> which-spark.log; which spark >> which-spark.log"}
-}
diff --git a/test/packages/npm-test-files-array-npmignore/.npmignore b/test/packages/npm-test-files-array-npmignore/.npmignore
deleted file mode 100644
index 2e1ecf039..000000000
--- a/test/packages/npm-test-files-array-npmignore/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*/bar
-**/asdf
diff --git a/test/packages/npm-test-files-array-npmignore/foo/bar b/test/packages/npm-test-files-array-npmignore/foo/bar
deleted file mode 100644
index 5716ca598..000000000
--- a/test/packages/npm-test-files-array-npmignore/foo/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/test/packages/npm-test-files-array-npmignore/foo/baz b/test/packages/npm-test-files-array-npmignore/foo/baz
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-files-array-npmignore/foo/baz
+++ /dev/null
diff --git a/test/packages/npm-test-files-array-npmignore/foo/foo/asdf b/test/packages/npm-test-files-array-npmignore/foo/foo/asdf
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-files-array-npmignore/foo/foo/asdf
+++ /dev/null
diff --git a/test/packages/npm-test-files-array-npmignore/foo/foo/bar b/test/packages/npm-test-files-array-npmignore/foo/foo/bar
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-files-array-npmignore/foo/foo/bar
+++ /dev/null
diff --git a/test/packages/npm-test-files-array-npmignore/foo/foo/baz b/test/packages/npm-test-files-array-npmignore/foo/foo/baz
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-files-array-npmignore/foo/foo/baz
+++ /dev/null
diff --git a/test/packages/npm-test-files-array-npmignore/package.json b/test/packages/npm-test-files-array-npmignore/package.json
deleted file mode 100644
index 31e6d3135..000000000
--- a/test/packages/npm-test-files-array-npmignore/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "name":"npm-test-files-array-npmignore"
-, "version" : "1.2.3"
-, "files" : ["foo", "test.sh"]
-, "scripts" : {"test":"./test.sh"}}
diff --git a/test/packages/npm-test-files-array-npmignore/test.sh b/test/packages/npm-test-files-array-npmignore/test.sh
deleted file mode 100755
index 45def4a65..000000000
--- a/test/packages/npm-test-files-array-npmignore/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-if [[ $npm_package_version == "9999.0.0-LINK-"* ]]; then
-  echo "link package, skipping test"
-  exit 0
-fi
-
-[ -f ./foo/baz ] && ! [ -f ./foo/bar ]
diff --git a/test/packages/npm-test-files-array-simple/bar b/test/packages/npm-test-files-array-simple/bar
deleted file mode 100644
index 5716ca598..000000000
--- a/test/packages/npm-test-files-array-simple/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/test/packages/npm-test-files-array-simple/foo b/test/packages/npm-test-files-array-simple/foo
deleted file mode 100644
index 257cc5642..000000000
--- a/test/packages/npm-test-files-array-simple/foo
+++ /dev/null
@@ -1 +0,0 @@
-foo
diff --git a/test/packages/npm-test-files-array-simple/package.json b/test/packages/npm-test-files-array-simple/package.json
deleted file mode 100644
index 535f110c4..000000000
--- a/test/packages/npm-test-files-array-simple/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "name":"npm-test-files-array-simple"
-, "version" : "1.2.3"
-, "files" : ["foo", "test.sh"]
-, "scripts" : {"test":"./test.sh"}}
diff --git a/test/packages/npm-test-files-array-simple/test.sh b/test/packages/npm-test-files-array-simple/test.sh
deleted file mode 100755
index 35f3cbe03..000000000
--- a/test/packages/npm-test-files-array-simple/test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-if [[ $npm_package_version == "9999.0.0-LINK-"* ]]; then
-  echo "link package, skipping test"
-  exit 0
-fi
-
-# test that there is a foo file, and that there is NOT a bar file
-[ -f ./foo ] && ! [ -f ./bar ]
diff --git a/test/packages/npm-test-npmignore/.dot-keeper b/test/packages/npm-test-npmignore/.dot-keeper
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-npmignore/.dot-keeper
+++ /dev/null
diff --git a/test/packages/npm-test-npmignore/.dotfile b/test/packages/npm-test-npmignore/.dotfile
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-npmignore/.dotfile
+++ /dev/null
diff --git a/test/packages/npm-test-npmignore/.dotglob-a b/test/packages/npm-test-npmignore/.dotglob-a
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-npmignore/.dotglob-a
+++ /dev/null
diff --git a/test/packages/npm-test-npmignore/.dotglob-b b/test/packages/npm-test-npmignore/.dotglob-b
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-npmignore/.dotglob-b
+++ /dev/null
diff --git a/test/packages/npm-test-npmignore/.dotglob-c b/test/packages/npm-test-npmignore/.dotglob-c
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-npmignore/.dotglob-c
+++ /dev/null
diff --git a/test/packages/npm-test-npmignore/.npmignore b/test/packages/npm-test-npmignore/.npmignore
deleted file mode 100644
index 266013fdb..000000000
--- a/test/packages/npm-test-npmignore/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*/bar
-.dotfile
-.dotglob*
diff --git a/test/packages/npm-test-npmignore/foo/bar b/test/packages/npm-test-npmignore/foo/bar
deleted file mode 100644
index 5716ca598..000000000
--- a/test/packages/npm-test-npmignore/foo/bar
+++ /dev/null
@@ -1 +0,0 @@
-bar
diff --git a/test/packages/npm-test-npmignore/foo/baz b/test/packages/npm-test-npmignore/foo/baz
deleted file mode 100644
index e69de29bb..000000000
--- a/test/packages/npm-test-npmignore/foo/baz
+++ /dev/null
diff --git a/test/packages/npm-test-npmignore/package.json b/test/packages/npm-test-npmignore/package.json
deleted file mode 100644
index 2f3418f47..000000000
--- a/test/packages/npm-test-npmignore/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "name" : "npm-test-npmignore"
-, "version" : "1.2.3"
-, "files" : ["foo", "test.sh", ""]
-, "scripts" : {"test":"./test.sh"}}
diff --git a/test/packages/npm-test-npmignore/test.sh b/test/packages/npm-test-npmignore/test.sh
deleted file mode 100755
index 093780a70..000000000
--- a/test/packages/npm-test-npmignore/test.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-if [[ $npm_package_version == "9999.0.0-LINK-"* ]]; then
-  echo "link package, skipping test"
-  exit 0
-fi
-
-[ -f ./foo/baz ] \
-  && ! [ -f ./foo/bar ] \
-  && [ -f ./.dot-keeper ] \
-  && ! [ -f ./.dot-glob-a ]
diff --git a/test/packages/npm-test-url-dep/package.json b/test/packages/npm-test-url-dep/package.json
index eccc08cc7..61ad7b557 100644
--- a/test/packages/npm-test-url-dep/package.json
+++ b/test/packages/npm-test-url-dep/package.json
@@ -3,4 +3,4 @@
 , "files" : []
 , "dependencies" :
   { "express" : "*"
-  , "npm" : "http://registry.npmjs.org/npm/-/npm-0.2.13-3.tgz" } }
+  , "npm" : "http://registry.npmjs.org/npm/-/npm-0.3.17.tgz" } }
diff --git a/test/run.sh b/test/run.sh
index c12ad6ccb..dec1b02c7 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -18,57 +18,41 @@ main () {
 
   npm install $( ls packages | awk '{print "packages/" $1 }' ) || exit 1
   (ls packages | while read pkg; do
-    npm test "$pkg"@"$(ls -- "$ROOTDIR"/.npm/"$pkg" | grep -v active)"
+    npm test "$pkg"
   done) || exit 1
   if [ "$FAILURES" == "0" ]; then
     npm rm $(ls packages) npm || exit 1
   fi
   cleanup
 
-  # link
-  npm install "$NPMPKG" || exit 1
-
-  # used in test later
-  npm config set package-config:foo boo || exit 1
-  (cd packages/npm-test-bundletest && npm bundle) || exit 1
-
-  (ls packages | awk '{print "packages/" $1 }' | while read pkg; do
-    npm link "$pkg"
-  done) || exit 1
-  (ls packages | while read pkg; do
-    npm test "$pkg"@"$(ls -- "$ROOTDIR"/.npm/"$pkg" | grep -v active)"
-  done) || exit 1
-  if [ "$FAILURES" == "0" ]; then
-    npm rm $(ls packages) npm || exit 1
-  fi
-  cleanup
-
-  # attempt to publish and unpublish each of them.
-  npm install "$NPMPKG" || exit 1
-
-  (ls packages | grep -v 'npm-test-private' | while read pkg; do
-    if [ "$pkg" != "npm-test-bundletest" ]; then
-      (cd packages/$pkg ; npm bundle destroy)
+  if ! [ "$npm_package_config_publishtest" == "true" ]; then
+    echo_err "To test publishing: npm config set npm:publishtest true"
+  else
+    # attempt to publish and unpublish each of them.
+    npm install "$NPMPKG" || exit 1
+
+    (ls packages | grep -v 'npm-test-private' | while read pkg; do
+      npm publish packages/$pkg || exit 1
+      npm install $pkg || exit 1
+      npm unpublish $pkg || exit 1
+    done) || exit 1
+
+    # verify that the private package can't be published
+    # bypass the test-harness npm function.
+    "$NPMCLI" publish packages/npm-test-private && (
+      npm unpublish npm-test-private
+      exit 1000
+    )
+    if [ $? -eq 1000 ]; then
+      fail "Private package shouldn't be publishable" >&2
     fi
-    npm publish packages/$pkg || exit 1
-    npm install $pkg || exit 1
-    npm unpublish $pkg || exit 1
-  done) || exit 1
 
-  # verify that the private package can't be published
-  # bypass the test-harness npm function.
-  "$NPMCLI" publish packages/npm-test-private && (
-    npm unpublish npm-test-private
-    exit 1000
-  )
-  if [ $? -eq 1000 ]; then
-    fail "Private package shouldn't be publishable" >&2
-  fi
+    if [ "$FAILURES" == "0" ]; then
+      npm rm $(ls packages) npm || exit 1
+    fi
+    cleanup
 
-  if [ "$FAILURES" == "0" ]; then
-    npm rm $(ls packages) npm || exit 1
   fi
-  cleanup
 
   if [ $FAILURES -eq 0 ]; then
     echo_err "ok"
@@ -116,27 +100,20 @@ rm -rf $TMP/npm*
 TMP=$TMP/npm-test-$$
 echo "Testing in $TMP ..."
 ROOTDIR="$TMP/root"
-BINDIR="$TMP/bin"
-MANDIR="$TMP/man"
 
 cleanup () {
   if [ "$FAILURES" != "0" ] && [ "$FAILURES" != "" ]; then
     return
   fi
   [ -d "$ROOTDIR" ] && rm -rf -- "$ROOTDIR"
-  [ -d "$BINDIR" ] && rm -rf -- "$BINDIR"
-  [ -d "$MANDIR" ] && rm -rf -- "$MANDIR"
   mkdir -p -- "$ROOTDIR"
-  mkdir -p -- "$BINDIR"
-  mkdir -p -- "$MANDIR"
 }
 
-export npm_config_root="$ROOTDIR"
-export npm_config_binroot="$BINDIR"
-export npm_config_manroot="$MANDIR"
+export npm_config_prefix="$ROOTDIR"
 export npm_config_color="always"
-export PATH="$PATH":"$BINDIR"
-export NODE_PATH="$ROOTDIR"
+export npm_config_global=true
+export PATH="$PATH":"$ROOTDIR/bin":"$ROOTDIR/node_modules/.bin"
+export NODE_PATH="$ROOTDIR/node_modules"
 
 echo_err () {
   echo "$@" >&2