Close #559 PR: Fix wrong handling of NODE_PATH and relative test.

Author: ingro

lib/fork.js

@@ -18,7 +18,7 @@ if (process.env.NODE_PATH) {
 		})
 		.join(path.delimiter);
 
-	env = objectAssign({NODE_PATH: nodePath}, env);
+	env = objectAssign(env, {NODE_PATH: nodePath});
 }
 
 module.exports = function (file, opts) {

test/cli.js

@@ -160,7 +160,7 @@ test('watcher works', function (t) {
 });
 
 test('handles NODE_PATH', function (t) {
-	var nodePaths = 'node-paths/modules' + path.delimiter + 'node-paths/deep/nested';
+	var nodePaths = 'fixture/node-paths/modules' + path.delimiter + 'fixture/node-paths/deep/nested';
 
 	execCli('fixture/node-paths.js', {env: {NODE_PATH: nodePaths}}, function (err) {
 		t.ifError(err);