@@ -55,13 +55,15 @@ const relativeTests = [ |
55 | 55 | ['http://localhost', 'file://foo/Users', 'file://foo/Users'], |
56 | 56 | ['https://registry.npmjs.org', '@foo/bar', 'https://registry.npmjs.org/@foo/bar'], |
57 | 57 | ]; |
58 | | -relativeTests.forEach(function(relativeTest) { |
| 58 | +for (let i = 0; i < relativeTests.length; i++) { |
| 59 | + const relativeTest = relativeTests[i]; |
| 60 | + |
59 | 61 | const a = url.resolve(relativeTest[0], relativeTest[1]); |
60 | 62 | const e = relativeTest[2]; |
61 | 63 | assert.strictEqual(a, e, |
62 | 64 | `resolve(${relativeTest[0]}, ${relativeTest[1]})` + |
63 | 65 | ` == ${e}\n actual=${a}`); |
64 | | -}); |
| 66 | +} |
65 | 67 |
|
66 | 68 | // |
67 | 69 | // Tests below taken from Chiron |
@@ -374,19 +376,23 @@ const relativeTests2 = [ |
374 | 376 | // No path at all |
375 | 377 | ['#hash1', '#hash2', '#hash1'], |
376 | 378 | ]; |
377 | | -relativeTests2.forEach(function(relativeTest) { |
| 379 | +for (let i = 0; i < relativeTests2.length; i++) { |
| 380 | + const relativeTest = relativeTests2[i]; |
| 381 | + |
378 | 382 | const a = url.resolve(relativeTest[1], relativeTest[0]); |
379 | 383 | const e = url.format(relativeTest[2]); |
380 | 384 | assert.strictEqual(a, e, |
381 | 385 | `resolve(${relativeTest[0]}, ${relativeTest[1]})` + |
382 | 386 | ` == ${e}\n actual=${a}`); |
383 | | -}); |
| 387 | +} |
384 | 388 |
|
385 | 389 | // If format and parse are inverse operations then |
386 | 390 | // resolveObject(parse(x), y) == parse(resolve(x, y)) |
387 | 391 |
|
388 | 392 | // format: [from, path, expected] |
389 | | -relativeTests.forEach(function(relativeTest) { |
| 393 | +for (let i = 0; i < relativeTests.length; i++) { |
| 394 | + const relativeTest = relativeTests[i]; |
| 395 | + |
390 | 396 | let actual = url.resolveObject(url.parse(relativeTest[0]), relativeTest[1]); |
391 | 397 | let expected = url.parse(relativeTest[2]); |
392 | 398 |
|
@@ -399,7 +405,8 @@ relativeTests.forEach(function(relativeTest) { |
399 | 405 | assert.strictEqual(actual, expected, |
400 | 406 | `format(${actual}) == ${expected}\n` + |
401 | 407 | `actual: ${actual}`); |
402 | | -}); |
| 408 | + |
| 409 | +} |
403 | 410 |
|
404 | 411 | // format: [to, from, result] |
405 | 412 | // the test: ['.//g', 'f:/a', 'f://g'] is a fundamental problem |
@@ -415,7 +422,9 @@ if (relativeTests2[181][0] === './/g' && |
415 | 422 | relativeTests2[181][2] === 'f://g') { |
416 | 423 | relativeTests2.splice(181, 1); |
417 | 424 | } |
418 | | -relativeTests2.forEach(function(relativeTest) { |
| 425 | +for (let i = 0; i < relativeTests2.length; i++) { |
| 426 | + const relativeTest = relativeTests2[i]; |
| 427 | + |
419 | 428 | let actual = url.resolveObject(url.parse(relativeTest[1]), relativeTest[0]); |
420 | 429 | let expected = url.parse(relativeTest[2]); |
421 | 430 |
|
@@ -431,4 +440,4 @@ relativeTests2.forEach(function(relativeTest) { |
431 | 440 | assert.strictEqual(actual, expected, |
432 | 441 | `format(${relativeTest[1]}) == ${expected}\n` + |
433 | 442 | `actual: ${actual}`); |
434 | | -}); |
| 443 | +} |