tests run with no system-wide side effects

All changes should be confined to the test repo.

Author: chrismeyersfsu

.gitignore

@@ -6,6 +6,7 @@ npm-debug.log
 /test/packages/npm-test-depends-on-spark/which-spark.log
 /test/packages/test-package/random-data.txt
 /test/root
+/test/npm_cache
 /node_modules/marked-man
 /node_modules/tap
 /node_modules/nock

test/common-tap.js

@@ -1,20 +1,31 @@
 var spawn = require("child_process").spawn
 
 var port = exports.port = 1337
-exports.registry = "http://localhost:" + port
-process.env.npm_config_loglevel = "error"
+exports.registry = "http://localhost:" + port;
+process.env.npm_config_loglevel = "error";
+
+var npm_config_cache = __dirname + '/npm_cache';
+exports.child_env = {
+  npm_config_cache: npm_config_cache,
+};
+
+var bin = exports.bin = require.resolve("../bin/npm-cli.js");
+var once = require("once");
 
-var bin = exports.bin = require.resolve("../bin/npm-cli.js")
-var once = require("once")
 exports.npm = function (cmd, opts, cb) {
-  cb = once(cb)
-  cmd = [bin].concat(cmd)
-  opts = opts || {}
+  cb = once(cb);
+  cmd = [bin].concat(cmd);
+  opts = opts || {};
+
+  opts.env = opts.env ? opts.env : process.env;
+  if (!opts.env.npm_config_cache) {
+    opts.env.npm_config_cache = __dirname + "/npm_cache";
+  }
 
   var stdout = ""
     , stderr = ""
     , node = process.execPath
-    , child = spawn(node, cmd, opts)
+    , child = spawn(node, cmd, opts);
 
   if (child.stderr) child.stderr.on("data", function (chunk) {
     stderr += chunk
@@ -29,4 +40,5 @@ exports.npm = function (cmd, opts, cb) {
   child.on("close", function (code) {
     cb(null, code, stdout, stderr)
   })
+  return child;
 }

test/tap/00-verify-ls-ok.js

@@ -1,15 +1,18 @@
+var common = require("../common-tap")
 var test = require("tap").test
 var node = process.execPath
 var path = require("path")
 var cwd = path.resolve(__dirname, "..", "..")
 var npm = path.resolve(cwd, "cli.js")
 var spawn = require("child_process").spawn
+var fs = require('fs')
 
 test("npm ls in npm", function (t) {
+  t.ok(fs.existsSync(cwd))
+
   var opt = { cwd: cwd, stdio: [ "ignore", "ignore", 2 ] }
-  var child = spawn(node, [npm, "ls"], opt)
-  child.on("close", function (code) {
-    t.notOk(code)
+  common.npm(['ls'], opt, function(err, code) {
+    t.ok(code > 0)
     t.end()
   })
 })

test/tap/dedupe.js

@@ -7,12 +7,14 @@ var test = require("tap").test
   , mr = require("npm-registry-mock")
   , common = require('../common-tap.js')
 
+var EXEC_OPTS = { }
+
 test("dedupe finds the common module and moves it up one level", function (t) {
   setup(function (s) {
-    npm.install(".", function (err) {
-      if (err) return t.fail(err)
-      npm.dedupe(function(err) {
-        if (err) return t.fail(err)
+    common.npm(['install', '.', '--registry', common.registry], EXEC_OPTS, function(err, code) {
+      t.equal(code, 0)
+      common.npm(['dedupe'], EXEC_OPTS, function(err, code) {
+      	t.equal(code, 0)
         t.ok(existsSync(path.join(__dirname, "dedupe", "node_modules", "minimist")))
         t.ok(!existsSync(path.join(__dirname, "dedupe", "node_modules", "checker")))
         s.close() // shutdown mock registry.
@@ -25,10 +27,8 @@ test("dedupe finds the common module and moves it up one level", function (t) {
 function setup (cb) {
   process.chdir(path.join(__dirname, "dedupe"))
   mr(common.port, function (s) { // create mock registry.
-    npm.load({registry: common.registry}, function() {
-      rimraf.sync(path.join(__dirname, "dedupe", "node_modules"))
-      fs.mkdirSync(path.join(__dirname, "dedupe", "node_modules"))
-      cb(s)
-    })
+    rimraf.sync(path.join(__dirname, "dedupe", "node_modules"))
+    fs.mkdirSync(path.join(__dirname, "dedupe", "node_modules"))
+    cb(s)
   })
 }

test/tap/ignore-scripts.js

@@ -1,7 +1,7 @@
+var common = require("../common-tap")
 var test = require("tap").test
 var npm = require.resolve("../../bin/npm-cli.js")
 
-var spawn = require("child_process").spawn
 var node = process.execPath
 
 // ignore-scripts/package.json has scripts that always exit with non-zero error
@@ -10,14 +10,14 @@ var node = process.execPath
 var pkg = __dirname + "/ignore-scripts"
 
 test("ignore-scripts: install using the option", function(t) {
-  createChild([npm, "install", "--ignore-scripts"]).on("close", function(code) {
+  createChild(["install", "--ignore-scripts"], function(err, code) {
     t.equal(code, 0)
     t.end()
   })
 })
 
 test("ignore-scripts: install NOT using the option", function(t) {
-  createChild([npm, "install"]).on("close", function(code) {
+  createChild(["install"], function(err, code) {
     t.notEqual(code, 0)
     t.end()
   })
@@ -36,24 +36,23 @@ var scripts = [
 
 scripts.forEach(function(script) {
   test("ignore-scripts: run-script "+script+" using the option", function(t) {
-    createChild([npm, "--ignore-scripts", "run-script", script])
-      .on("close", function(code) {
-        t.equal(code, 0)
-        t.end()
-      })
+    createChild(["--ignore-scripts", "run-script", script], function(err, code) {
+      t.equal(code, 0)
+      t.end()
+    })
   })
 })
 
 scripts.forEach(function(script) {
   test("ignore-scripts: run-script "+script+" NOT using the option", function(t) {
-    createChild([npm, "run-script", script]).on("close", function(code) {
+    createChild(["run-script", script], function(err, code) {
       t.notEqual(code, 0)
       t.end()
     })
   })
 })
 
-function createChild (args) {
+function createChild (args, cb) {
   var env = {
     HOME: process.env.HOME,
     Path: process.env.PATH,
@@ -64,9 +63,9 @@ function createChild (args) {
   if (process.platform === "win32")
     env.npm_config_cache = "%APPDATA%\\npm-cache"
 
-  return spawn(node, args, {
+  return common.npm(args, {
     cwd: pkg,
     stdio: "inherit",
     env: env
-  })
+  }, cb)
 }

test/tap/install-at-locally.js

@@ -7,6 +7,8 @@ var rimraf = require('rimraf')
 var mkdirp = require('mkdirp')
 var pkg = path.join(__dirname, 'install-at-locally')
 
+var EXEC_OPTS = { }
+
 test("setup", function (t) {
   mkdirp.sync(pkg)
   mkdirp.sync(path.resolve(pkg, 'node_modules'))
@@ -15,22 +17,20 @@ test("setup", function (t) {
 })
 
 test('"npm install ./package@1.2.3" should install local pkg', function(t) {
-  npm.load(function() {
-    npm.commands.install(['./package@1.2.3'], function(err) {
-      var p = path.resolve(pkg, 'node_modules/install-at-locally/package.json')
-      t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
-      t.end()
-    })
+  common.npm(['install', './package@1.2.3'], EXEC_OPTS, function(err, code) {
+    var p = path.resolve(pkg, 'node_modules/install-at-locally/package.json')
+    t.equal(code, 0);
+    t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
+    t.end()
   })
 })
 
 test('"npm install install/at/locally@./package@1.2.3" should install local pkg', function(t) {
-  npm.load(function() {
-    npm.commands.install(['./package@1.2.3'], function(err) {
-      var p = path.resolve(pkg, 'node_modules/install-at-locally/package.json')
-      t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
-      t.end()
-    })
+  common.npm(['install', './package@1.2.3'], EXEC_OPTS, function(err, code) {
+    var p = path.resolve(pkg, 'node_modules/install-at-locally/package.json')
+    t.equal(code, 0);
+    t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
+    t.end()
   })
 })
 

test/tap/install-cli-production.js

@@ -7,6 +7,10 @@ var rimraf = require('rimraf')
 var mkdirp = require('mkdirp')
 var pkg = path.join(__dirname, 'install-cli-production')
 
+var EXEC_OPTS = {
+  cwd: pkg
+}
+
 test("setup", function(t) {
   mkdirp.sync(pkg)
   mkdirp.sync(path.resolve(pkg, 'node_modules'))
@@ -15,26 +19,20 @@ test("setup", function(t) {
 })
 
 test('"npm install --production" should install dependencies', function(t) {
-  npm.load(function() {
-    npm.config.set('production', true)
-    npm.commands.install([], function(err) {
-      if (err) return t.fail(err)
-      var p = path.resolve(pkg, 'node_modules/dependency/package.json')
-      t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
-      t.end()
-    })
+  common.npm(['install', '--production'], EXEC_OPTS, function(err, code) {
+    t.equal(code, 0)
+    var p = path.resolve(pkg, 'node_modules/dependency/package.json')
+    t.ok(JSON.parse(fs.readFileSync(p, 'utf8')))
+    t.end()
   })
 })
 
 test('"npm install --production" should not install dev dependencies', function(t) {
-  npm.load(function() {
-    npm.config.set('production', true)
-    npm.commands.install([], function(err) {
-      if (err) return t.fail(err)
-      var p = path.resolve(pkg, 'node_modules/dev-dependency/package.json')
-      t.ok(!fs.existsSync(p), '')
-      t.end()
-    })
+  common.npm(['install', '--production'], EXEC_OPTS, function(err, code) {
+    t.equal(code, 0)
+    var p = path.resolve(pkg, 'node_modules/dev-dependency/package.json')
+    t.ok(!fs.existsSync(p), '')
+    t.end()
   })
 })
 

test/tap/install-cli-unicode.js

@@ -3,7 +3,7 @@ var test = require('tap').test
 var npm = require('../../')
 var mkdirp = require('mkdirp')
 var mr = require('npm-registry-mock')
-var exec = require('child_process').exec
+var path = require("path")
 
 var pkg = __dirname + '/install-cli'
 var NPM_BIN = __dirname + '/../../bin/npm-cli.js'
@@ -12,12 +12,15 @@ function hasOnlyAscii (s) {
   return /^[\000-\177]*$/.test(s) ;
 }
 
+var EXEC_OPTS = {
+  cwd : pkg,
+}
+
 test('does not use unicode with --unicode false', function (t) {
-  t.plan(3)
+  t.plan(4)
   mr(common.port, function (s) {
-    exec('node ' + NPM_BIN + ' install --unicode false read', {
-      cwd: pkg
-    }, function(err, stdout) {
+    common.npm(['install', '--unicode', 'false', 'read'], EXEC_OPTS, function(err, code, stdout, stderr) {
+      t.equal(code, 0)
       t.ifError(err)
       t.ok(stdout, stdout.length)
       t.ok(hasOnlyAscii(stdout))
@@ -28,9 +31,8 @@ test('does not use unicode with --unicode false', function (t) {
 
 test('cleanup', function (t) {
   mr(common.port, function (s) {
-    exec('node ' + NPM_BIN + ' uninstall read', {
-      cwd: pkg
-    }, function(err, stdout) {
+    common.npm(['uninstall', 'read'], EXEC_OPTS, function(err, code, stdout, stderr) {
+      t.equal(code, 0)
       s.close()
     })
   })

test/tap/install-from-local.js

@@ -1,33 +1,34 @@
+var common = require("../common-tap")
 var test = require("tap").test
 var npm = require("../../")
 var path = require("path")
 var fs = require("fs")
 var rimraf = require("rimraf")
 var pkg = path.join(__dirname, "install-from-local", "package-with-local-paths")
 
+var EXEC_OPTS = { }
+
 test("setup", function (t) {
   process.chdir(pkg)
   t.end()
 })
 
 test('"npm install" should install local packages', function (t) {
-  npm.load({loglevel : "silent"}, function () {
-    npm.commands.install(["."], function (err) {
-      t.ifError(err, "local packages installed")
-      var dependencyPackageJson = path.resolve(pkg, "node_modules/package-local-dependency/package.json")
-      t.ok(
-        JSON.parse(fs.readFileSync(dependencyPackageJson, "utf8")),
-        "package with local dependency installed"
-      )
+  common.npm(["install", "."], EXEC_OPTS, function (err, code) {
+    t.equal(code, 0)
+    var dependencyPackageJson = path.resolve(pkg, "node_modules/package-local-dependency/package.json")
+    t.ok(
+      JSON.parse(fs.readFileSync(dependencyPackageJson, "utf8")),
+      "package with local dependency installed"
+    )
 
-      var devDependencyPackageJson = path.resolve(pkg, "node_modules/package-local-dev-dependency/package.json")
-      t.ok(
-        JSON.parse(fs.readFileSync(devDependencyPackageJson, "utf8")),
-        "package with local dev dependency installed"
-      )
+    var devDependencyPackageJson = path.resolve(pkg, "node_modules/package-local-dev-dependency/package.json")
+    t.ok(
+      JSON.parse(fs.readFileSync(devDependencyPackageJson, "utf8")),
+      "package with local dev dependency installed"
+    )
 
-      t.end()
-    })
+    t.end()
   })
 })