Skip to content

Commit 8280c53

Browse files
ljharbljharb
committed
[Tests] use path.join more often to normalize paths across OS’s.
1 parent f63faaf commit 8280c53

File tree

8 files changed

+100
-94
lines changed

8 files changed

+100
-94
lines changed

‎test/dotdot.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1+
var path = require('path');
12
var test = require('tape');
23
var resolve = require('../');
34

45
test('dotdot', function (t) {
56
t.plan(4);
6-
var dir = __dirname + '/dotdot/abc';
7+
var dir = path.join(__dirname, '/dotdot/abc');
78

89
resolve('..', { basedir: dir }, function (err, res, pkg) {
910
t.ifError(err);
10-
t.equal(res, __dirname + '/dotdot/index.js');
11+
t.equal(res, path.join(__dirname, 'dotdot/index.js'));
1112
});
1213

1314
resolve('.', { basedir: dir }, function (err, res, pkg) {
1415
t.ifError(err);
15-
t.equal(res, dir + '/index.js');
16+
t.equal(res, path.join(dir, 'index.js'));
1617
});
1718
});
1819

1920
test('dotdot sync', function (t) {
2021
t.plan(2);
21-
var dir = __dirname + '/dotdot/abc';
22+
var dir = path.join(__dirname, '/dotdot/abc');
2223

2324
var a = resolve.sync('..', { basedir: dir });
24-
t.equal(a, __dirname + '/dotdot/index.js');
25+
t.equal(a, path.join(__dirname, 'dotdot/index.js'));
2526

2627
var b = resolve.sync('.', { basedir: dir });
27-
t.equal(b, dir + '/index.js');
28+
t.equal(b, path.join(dir, 'index.js'));
2829
});

‎test/filter.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
var path = require('path');
12
var test = require('tape');
23
var resolve = require('../');
34

45
test('filter', function (t) {
56
t.plan(2);
6-
var dir = __dirname + '/resolver';
7+
var dir = path.join(__dirname, 'resolver');
78
resolve('./baz', {
89
basedir: dir,
910
packageFilter: function (pkg) {
@@ -12,7 +13,7 @@ test('filter', function (t) {
1213
}
1314
}, function (err, res, pkg) {
1415
if (err) t.fail(err);
15-
t.equal(res, dir + '/baz/doom.js');
16+
t.equal(res, path.join(dir, 'baz/doom.js'));
1617
t.equal(pkg.main, 'doom');
1718
});
1819
});

‎test/filter_sync.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1+
var path = require('path');
12
var test = require('tape');
23
var resolve = require('../');
34

45
test('filter', function (t) {
5-
var dir = __dirname + '/resolver';
6+
var dir = path.join(__dirname, 'resolver');
67
var res = resolve.sync('./baz', {
78
basedir: dir,
89
packageFilter: function (pkg) {
910
pkg.main = 'doom';
1011
return pkg;
1112
}
1213
});
13-
t.equal(res, dir + '/baz/doom.js');
14+
t.equal(res, path.join(dir, 'baz/doom.js'));
1415
t.end();
1516
});

‎test/module_dir.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
var path = require('path');
12
var test = require('tape');
23
var resolve = require('../');
34

45
test('moduleDirectory strings', function (t) {
56
t.plan(4);
6-
var dir = __dirname + '/module_dir';
7+
var dir = path.join(__dirname, 'module_dir');
78
var xopts = {
89
basedir: dir,
910
moduleDirectory: 'xmodules'
1011
};
1112
resolve('aaa', xopts, function (err, res, pkg) {
1213
t.ifError(err);
13-
t.equal(res, dir + '/xmodules/aaa/index.js');
14+
t.equal(res, path.join(dir, '/xmodules/aaa/index.js'));
1415
});
1516

1617
var yopts = {
@@ -19,20 +20,20 @@ test('moduleDirectory strings', function (t) {
1920
};
2021
resolve('aaa', yopts, function (err, res, pkg) {
2122
t.ifError(err);
22-
t.equal(res, dir + '/ymodules/aaa/index.js');
23+
t.equal(res, path.join(dir, '/ymodules/aaa/index.js'));
2324
});
2425
});
2526

2627
test('moduleDirectory array', function (t) {
2728
t.plan(6);
28-
var dir = __dirname + '/module_dir';
29+
var dir = path.join(__dirname, 'module_dir');
2930
var aopts = {
3031
basedir: dir,
3132
moduleDirectory: ['xmodules', 'ymodules', 'zmodules']
3233
};
3334
resolve('aaa', aopts, function (err, res, pkg) {
3435
t.ifError(err);
35-
t.equal(res, dir + '/xmodules/aaa/index.js');
36+
t.equal(res, path.join(dir, '/xmodules/aaa/index.js'));
3637
});
3738

3839
var bopts = {
@@ -41,7 +42,7 @@ test('moduleDirectory array', function (t) {
4142
};
4243
resolve('aaa', bopts, function (err, res, pkg) {
4344
t.ifError(err);
44-
t.equal(res, dir + '/ymodules/aaa/index.js');
45+
t.equal(res, path.join(dir, '/ymodules/aaa/index.js'));
4546
});
4647

4748
var copts = {
@@ -50,6 +51,6 @@ test('moduleDirectory array', function (t) {
5051
};
5152
resolve('bbb', copts, function (err, res, pkg) {
5253
t.ifError(err);
53-
t.equal(res, dir + '/zmodules/bbb/main.js');
54+
t.equal(res, path.join(dir, '/zmodules/bbb/main.js'));
5455
});
5556
});

‎test/node_path.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ test('$NODE_PATH', function (t) {
77

88
resolve('aaa', {
99
paths: [
10-
__dirname + '/node_path/x',
11-
__dirname + '/node_path/y'
10+
path.join(__dirname, '/node_path/x'),
11+
path.join(__dirname, '/node_path/y')
1212
],
1313
basedir: __dirname
1414
}, function (err, res) {
15-
t.equal(res, __dirname + '/node_path/x/aaa/index.js');
15+
t.equal(res, path.join(__dirname, '/node_path/x/aaa/index.js'));
1616
});
1717

1818
resolve('bbb', {
1919
paths: [
20-
__dirname + '/node_path/x',
21-
__dirname + '/node_path/y'
20+
path.join(__dirname, '/node_path/x'),
21+
path.join(__dirname, '/node_path/y')
2222
],
2323
basedir: __dirname
2424
}, function (err, res) {
25-
t.equal(res, __dirname + '/node_path/y/bbb/index.js');
25+
t.equal(res, path.join(__dirname, '/node_path/y/bbb/index.js'));
2626
});
2727

2828
resolve('ccc', {
2929
paths: [
30-
__dirname + '/node_path/x',
31-
__dirname + '/node_path/y'
30+
path.join(__dirname, '/node_path/x'),
31+
path.join(__dirname, '/node_path/y')
3232
],
3333
basedir: __dirname
3434
}, function (err, res) {
35-
t.equal(res, __dirname + '/node_path/x/ccc/index.js');
35+
t.equal(res, path.join(__dirname, '/node_path/x/ccc/index.js'));
3636
});
3737

3838
// ensure that relative paths still resolve against the

‎test/pathfilter.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
var path = require('path');
12
var test = require('tape');
23
var resolve = require('../');
34

45
test('#62: deep module references and the pathFilter', function (t) {
56
t.plan(9);
67

7-
var resolverDir = __dirname + '/pathfilter/deep_ref';
8+
var resolverDir = path.join(__dirname, '/pathfilter/deep_ref');
89
var pathFilter = function (pkg, x, remainder) {
910
t.equal(pkg.version, '1.2.3');
10-
t.equal(x, resolverDir + '/node_modules/deep/ref');
11+
t.equal(x, path.join(resolverDir, 'node_modules/deep/ref'));
1112
t.equal(remainder, 'ref');
1213
return 'alt';
1314
};
@@ -16,7 +17,7 @@ test('#62: deep module references and the pathFilter', function (t) {
1617
if (err) t.fail(err);
1718

1819
t.equal(pkg.version, '1.2.3');
19-
t.equal(res, resolverDir + '/node_modules/deep/ref.js');
20+
t.equal(res, path.join(resolverDir, 'node_modules/deep/ref.js'));
2021
});
2122

2223
resolve(
@@ -26,7 +27,7 @@ test('#62: deep module references and the pathFilter', function (t) {
2627
if (err) t.fail(err);
2728
t.notEqual(pkg, undefined);
2829
t.equal(pkg.version, '1.2.3');
29-
t.equal(res, resolverDir + '/node_modules/deep/deeper/ref.js');
30+
t.equal(res, path.join(resolverDir, 'node_modules/deep/deeper/ref.js'));
3031
}
3132
);
3233

@@ -35,7 +36,7 @@ test('#62: deep module references and the pathFilter', function (t) {
3536
{ basedir: resolverDir, pathFilter: pathFilter },
3637
function (err, res, pkg) {
3738
if (err) t.fail(err);
38-
t.equal(res, resolverDir + '/node_modules/deep/alt.js');
39+
t.equal(res, path.join(resolverDir, 'node_modules/deep/alt.js'));
3940
}
4041
);
4142
});

0 commit comments

Comments
 (0)