Commit 51fb884
test: fix redeclared test-path vars
PR-URL: #4991
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
Reviewed-By: Roman Klauke <romaaan.git@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent b16b360 commit 51fb884
1 file changed
Lines changed: 8 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -304,9 +304,10 @@ assert.equal(path.posix.normalize('a//b//./c'), 'a/b/c'); | |||
| 304 | 304 | assert.equal(path.posix.normalize('a//b//.'), 'a/b'); | |
| 305 | 305 | ||
| 306 | 306 | // path.resolve tests | |
| 307 | + var resolveTests; | ||
| 307 | 308 | if (common.isWindows) { | |
| 308 | 309 | // windows | |
| 309 | - var resolveTests = | ||
| 310 | + resolveTests = | ||
| 310 | 311 | // arguments result | |
| 311 | 312 | [[['c:/blah\\blah', 'd:/games', 'c:../a'], 'c:\\blah\\a'], | |
| 312 | 313 | [['c:/ignore', 'd:\\a/b\\c/d', '\\e.exe'], 'd:\\e.exe'], | |
@@ -322,15 +323,15 @@ if (common.isWindows) { | |||
| 322 | 323 | ]; | |
| 323 | 324 | } else { | |
| 324 | 325 | // Posix | |
| 325 | - var resolveTests = | ||
| 326 | + resolveTests = | ||
| 326 | 327 | // arguments result | |
| 327 | 328 | [[['/var/lib', '../', 'file/'], '/var/file'], | |
| 328 | 329 | [['/var/lib', '/../', 'file/'], '/file'], | |
| 329 | 330 | [['a/b/c/', '../../..'], process.cwd()], | |
| 330 | 331 | [['.'], process.cwd()], | |
| 331 | 332 | [['/some/dir', '.', '/absolute/'], '/absolute']]; | |
| 332 | 333 | } | |
| 333 | - var failures = []; | ||
| 334 | + failures = []; | ||
| 334 | 335 | resolveTests.forEach(function(test) { | |
| 335 | 336 | var actual = path.resolve.apply(path, test[0]); | |
| 336 | 337 | var expected = test[1]; | |
@@ -358,9 +359,10 @@ assert.equal(path.posix.isAbsolute('bar/'), false); | |||
| 358 | 359 | assert.equal(path.posix.isAbsolute('./baz'), false); | |
| 359 | 360 | ||
| 360 | 361 | // path.relative tests | |
| 362 | + var relativeTests; | ||
| 361 | 363 | if (common.isWindows) { | |
| 362 | 364 | // windows | |
| 363 | - var relativeTests = | ||
| 365 | + relativeTests = | ||
| 364 | 366 | // arguments result | |
| 365 | 367 | [['c:/blah\\blah', 'd:/games', 'd:\\games'], | |
| 366 | 368 | ['c:/aaaa/bbbb', 'c:/aaaa', '..'], | |
@@ -372,7 +374,7 @@ if (common.isWindows) { | |||
| 372 | 374 | ['c:/aaaa/bbbb', 'd:\\', 'd:\\']]; | |
| 373 | 375 | } else { | |
| 374 | 376 | // posix | |
| 375 | - var relativeTests = | ||
| 377 | + relativeTests = | ||
| 376 | 378 | // arguments result | |
| 377 | 379 | [['/var/lib', '/var', '..'], | |
| 378 | 380 | ['/var/lib', '/bin', '../../bin'], | |
@@ -381,7 +383,7 @@ if (common.isWindows) { | |||
| 381 | 383 | ['/var/', '/var/lib', 'lib'], | |
| 382 | 384 | ['/', '/var/lib', 'var/lib']]; | |
| 383 | 385 | } | |
| 384 | - var failures = []; | ||
| 386 | + failures = []; | ||
| 385 | 387 | relativeTests.forEach(function(test) { | |
| 386 | 388 | var actual = path.relative(test[0], test[1]); | |
| 387 | 389 | var expected = test[2]; | |
0 commit comments