Skip to content

Commit c973551

Browse files
joyeecheungBridgeAR
authored andcommittedNov 13, 2018
test: use URL fixtures under test/fixtures/wpt/url/resources
Removes the following files: - test/fixtures/url-tests.js - test/fixtures/url-setter-tests.js - test/fixtures/url-toascii.js in favor of: - test/fixtures/wpt/url/resources/urltestdata.json - test/fixtures/wpt/url/resources/setters_tests.json - test/fixtures/wpt/url/resources/toascii.json Also removes dependency of `fixtures/url-tests.js` in http2 tests and use `fixtures/person-large.jpg` instead since they are just looking for a big enough file to transfer. PR-URL: #24035 Refs: #23192 Reviewed-By: Daijiro Wachi <[email protected]>
1 parent 3f935d7 commit c973551

14 files changed

+29
-8704
lines changed
 

‎test/fixtures/url-setter-tests.js

-1,874
This file was deleted.

‎test/fixtures/url-tests.js

-6,662
This file was deleted.

‎test/fixtures/url-toascii.js

-157
This file was deleted.

‎test/known_issues/test-url-parse-conformance.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ require('../common');
55
const url = require('url');
66
const assert = require('assert');
77
const fixtures = require('../common/fixtures');
8-
const tests = require(fixtures.path('url-tests'));
8+
const tests = require(
9+
fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
10+
);
911

1012
let failed = 0;
1113
let attempted = 0;

‎test/parallel/test-http2-compat-serverrequest-pipe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const path = require('path');
1313

1414
const tmpdir = require('../common/tmpdir');
1515
tmpdir.refresh();
16-
const loc = fixtures.path('url-tests.js');
16+
const loc = fixtures.path('person-large.jpg');
1717
const fn = path.join(tmpdir.path, 'http2-url-tests.js');
1818

1919
const server = http2.createServer();

‎test/parallel/test-http2-pipe-named-pipe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const path = require('path');
1414

1515
const tmpdir = require('../common/tmpdir');
1616
tmpdir.refresh();
17-
const loc = fixtures.path('url-tests.js');
17+
const loc = fixtures.path('person-large.jpg');
1818
const fn = path.join(tmpdir.path, 'http2-url-tests.js');
1919

2020
const server = http2.createServer();

‎test/parallel/test-http2-pipe.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const path = require('path');
1313

1414
const tmpdir = require('../common/tmpdir');
1515
tmpdir.refresh();
16-
const loc = fixtures.path('url-tests.js');
16+
const loc = fixtures.path('person-large.jpg');
1717
const fn = path.join(tmpdir.path, 'http2-url-tests.js');
1818

1919
const server = http2.createServer();

‎test/parallel/test-icu-punycode.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ const icu = internalBinding('icu');
1010
const assert = require('assert');
1111

1212
const tests = require('../fixtures/url-idna.js');
13-
const wptToASCIITests = require('../fixtures/url-toascii.js');
13+
const fixtures = require('../common/fixtures');
14+
const wptToASCIITests = require(
15+
fixtures.path('wpt', 'url', 'resources', 'toascii.json')
16+
);
1417

1518
{
1619
for (const [i, { ascii, unicode }] of tests.entries()) {

‎test/parallel/test-whatwg-url-constructor.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ const { test, assert_equals, assert_true, assert_throws } =
1111
require('../common/wpt');
1212

1313
const request = {
14-
response: require(fixtures.path('url-tests'))
14+
response: require(
15+
fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
16+
)
1517
};
1618

1719
/* The following tests are copied from WPT. Modifications to them should be

‎test/parallel/test-whatwg-url-custom-domainto.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ const assert = require('assert');
1111
const { domainToASCII, domainToUnicode } = require('url');
1212

1313
const tests = require('../fixtures/url-idna');
14-
const wptToASCIITests = require('../fixtures/url-toascii');
14+
const fixtures = require('../common/fixtures');
15+
const wptToASCIITests = require(
16+
fixtures.path('wpt', 'url', 'resources', 'toascii.json')
17+
);
1518

1619
{
1720
const expectedError = common.expectsError(

‎test/parallel/test-whatwg-url-custom-parsing.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const URL = require('url').URL;
1212
const assert = require('assert');
1313
const fixtures = require('../common/fixtures');
1414

15-
const tests = require(fixtures.path('url-tests'));
15+
const tests = require(
16+
fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
17+
);
1618

1719
const originalFailures = tests.filter((test) => test.failure);
1820

‎test/parallel/test-whatwg-url-origin.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ const URL = require('url').URL;
1010
const { test, assert_equals } = require('../common/wpt');
1111

1212
const request = {
13-
response: require(fixtures.path('url-tests'))
13+
response: require(
14+
fixtures.path('wpt', 'url', 'resources', 'urltestdata.json')
15+
)
1416
};
1517

1618
/* The following tests are copied from WPT. Modifications to them should be

‎test/parallel/test-whatwg-url-setters.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ const { test, assert_equals } = require('../common/wpt');
1111
const fixtures = require('../common/fixtures');
1212

1313
const request = {
14-
response: require(fixtures.path('url-setter-tests'))
14+
response: require(fixtures.path(
15+
'wpt', 'url', 'resources', 'setters_tests.json'
16+
))
1517
};
1618

1719
/* The following tests are copied from WPT. Modifications to them should be

‎test/parallel/test-whatwg-url-toascii.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ const { URL } = require('url');
1010
const { test, assert_equals, assert_throws } = require('../common/wpt');
1111

1212
const request = {
13-
response: require(fixtures.path('url-toascii'))
13+
response: require(
14+
fixtures.path('wpt', 'url', 'resources', 'toascii.json')
15+
)
1416
};
1517

1618
/* The following tests are copied from WPT. Modifications to them should be

0 commit comments

Comments
 (0)