add linting (and some initial fixes)

1 files changed, 19 insertions, 18 deletions

diff --git a/node_modules/resolve/test/node_path.js b/node_modules/resolve/test/node_path.js
index 2407189b8..38a7d7e7d 100644
--- a/node_modules/resolve/test/node_path.js
+++ b/node_modules/resolve/test/node_path.js
@@ -4,45 +4,46 @@ var resolve = require('../');
 
 test('$NODE_PATH', function (t) {
     t.plan(4);
-    
+
     resolve('aaa', {
         paths: [
-            __dirname + '/node_path/x',
-            __dirname + '/node_path/y'
+            path.join(__dirname, '/node_path/x'),
+            path.join(__dirname, '/node_path/y')
         ],
-        basedir: __dirname,
+        basedir: __dirname
     }, function (err, res) {
-        t.equal(res, __dirname + '/node_path/x/aaa/index.js');
+        t.equal(res, path.join(__dirname, '/node_path/x/aaa/index.js'));
     });
-    
+
     resolve('bbb', {
         paths: [
-            __dirname + '/node_path/x',
-            __dirname + '/node_path/y'
+            path.join(__dirname, '/node_path/x'),
+            path.join(__dirname, '/node_path/y')
         ],
-        basedir: __dirname,
+        basedir: __dirname
     }, function (err, res) {
-        t.equal(res, __dirname + '/node_path/y/bbb/index.js');
+        t.equal(res, path.join(__dirname, '/node_path/y/bbb/index.js'));
     });
-    
+
     resolve('ccc', {
         paths: [
-            __dirname + '/node_path/x',
-            __dirname + '/node_path/y'
+            path.join(__dirname, '/node_path/x'),
+            path.join(__dirname, '/node_path/y')
         ],
-        basedir: __dirname,
+        basedir: __dirname
     }, function (err, res) {
-        t.equal(res, __dirname + '/node_path/x/ccc/index.js');
+        t.equal(res, path.join(__dirname, '/node_path/x/ccc/index.js'));
     });
 
     // ensure that relative paths still resolve against the
     // regular `node_modules` correctly
     resolve('tap', {
         paths: [
-            'node_path',
+            'node_path'
         ],
-        basedir: 'node_path/x',
+        basedir: 'node_path/x'
     }, function (err, res) {
-        t.equal(res, path.resolve(__dirname, '..', 'node_modules/tap/lib/main.js'));
+        var root = require('tap/package.json').main;
+        t.equal(res, path.resolve(__dirname, '..', 'node_modules/tap', root));
     });
 });