Skip to content

Commit 68f2509

Browse files
committed
Fix nocase-nomagic test to not be C:\ specific
1 parent d9f29e8 commit 68f2509

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

test/nocase-nomagic.js

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ var fs = require('fs')
33
var test = require('tap').test;
44
var glob = require('../');
55

6+
var cwd = process.cwd()
7+
var drive = 'c'
8+
if (/^[a-zA-Z]:[\\\/]/.test(cwd)) {
9+
drive = cwd.charAt(0).toLowerCase()
10+
}
11+
612
test('mock fs', function(t) {
713
var stat = fs.stat
814
var statSync = fs.statSync
@@ -12,10 +18,10 @@ test('mock fs', function(t) {
1218
function fakeStat(path) {
1319
var ret
1420
switch (path.toLowerCase().replace(/\\/g, '/')) {
15-
case '/tmp': case '/tmp/': case 'c:\\tmp': case 'c:\\tmp\\':
21+
case '/tmp': case '/tmp/': case drive+':\\tmp': case drive+':\\tmp\\':
1622
ret = { isDirectory: function() { return true } }
1723
break
18-
case '/tmp/a': case 'c:/tmp/a':
24+
case '/tmp/a': case drive+':/tmp/a':
1925
ret = { isDirectory: function() { return false } }
2026
break
2127
}
@@ -40,10 +46,10 @@ test('mock fs', function(t) {
4046
function fakeReaddir(path) {
4147
var ret
4248
switch (path.toLowerCase().replace(/\\/g, '/')) {
43-
case '/tmp': case '/tmp/': case 'c:/tmp': case 'c:/tmp/':
49+
case '/tmp': case '/tmp/': case drive+':/tmp': case drive+':/tmp/':
4450
ret = [ 'a', 'A' ]
4551
break
46-
case '/': case 'c:/':
52+
case '/': case drive+':/':
4753
ret = ['tmp', 'tMp', 'tMP', 'TMP']
4854
}
4955
return ret
@@ -79,15 +85,15 @@ test('nocase, nomagic', function(t) {
7985
'/tmp/a' ]
8086
if(process.platform.match(/^win/)) {
8187
want = want.map(function(p) {
82-
return 'c:' + p
88+
return drive+':' + p
8389
})
8490
}
8591
glob('/tmp/a', { nocase: true }, function(er, res) {
8692
if (er)
8793
throw er
8894
if (process.platform.match(/^win/))
8995
res = res.map(function (r) {
90-
return r.replace(/\\/g, '/').replace(/^C:/, 'c:')
96+
return r.replace(/\\/g, '/').replace(new RegExp('^' + drive + ':'), drive+':')
9197
})
9298
t.same(res.sort(), want)
9399
if (--n === 0) t.end()
@@ -97,7 +103,7 @@ test('nocase, nomagic', function(t) {
97103
throw er
98104
if (process.platform.match(/^win/))
99105
res = res.map(function (r) {
100-
return r.replace(/\\/g, '/').replace(/^C:/, 'c:')
106+
return r.replace(/\\/g, '/').replace(new RegExp('^' + drive + ':'), drive+':')
101107
})
102108
t.same(res.sort(), want)
103109
if (--n === 0) t.end()
@@ -116,7 +122,7 @@ test('nocase, with some magic', function(t) {
116122
'/tmp/a' ]
117123
if(process.platform.match(/^win/)) {
118124
want = want.map(function(p) {
119-
return 'c:' + p
125+
return drive + ':' + p
120126
})
121127
}
122128

0 commit comments

Comments
 (0)