diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e07183a..caf908f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ on: jobs: test: - uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.2.0 + uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.2.1 with: license-check: true - node-versions: '["16", "18", "20"]' + node-versions: '["16", "18", "20", "22"]' diff --git a/.github/workflows/package-manager-ci.yml b/.github/workflows/package-manager-ci.yml index 113aad3..60b4e6a 100644 --- a/.github/workflows/package-manager-ci.yml +++ b/.github/workflows/package-manager-ci.yml @@ -17,4 +17,4 @@ on: jobs: test: - uses: fastify/workflows/.github/workflows/plugins-ci-package-manager.yml@v4.1.0 + uses: fastify/workflows/.github/workflows/plugins-ci-package-manager.yml@v4.2.1 diff --git a/.taprc b/.taprc deleted file mode 100644 index 343ddd5..0000000 --- a/.taprc +++ /dev/null @@ -1,3 +0,0 @@ -disable-coverage: true -files: - - test/**/*.test.js diff --git a/package.json b/package.json index cf54eeb..f836ea3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "lint:fix": "standard --fix", "test": "npm run lint && npm run test:unit && npm run test:typescript", "test:ci": "npm run lint && npm run test:unit -- --coverage-report=lcovonly && npm run test:typescript", - "test:unit": "tap", + "test:unit": "npx tape test/**/*.js", "test:unit:dev": "npm run test:unit -- --coverage-report=html", "test:typescript": "tsd" }, @@ -32,7 +32,7 @@ "coveralls": "^3.1.1", "snazzy": "^9.0.0", "standard": "^17.1.0", - "tap": "^18.7.2", + "tape": "^5.8.1", "tsd": "^0.31.0", "uri-js": "^4.4.1" } diff --git a/test/ajv.test.js b/test/ajv.test.js index 42ecb45..e78c4d7 100644 --- a/test/ajv.test.js +++ b/test/ajv.test.js @@ -3,7 +3,7 @@ const fastUri = require('../') const ajv = new AJV({ uriResolver: fastUri // comment this line to see it works with uri-js }) -const { test } = require('tap') +const test = require('tape') test('ajv', t => { t.plan(1) diff --git a/test/compatibility.test.js b/test/compatibility.test.js index 7da9e62..da4cbd2 100644 --- a/test/compatibility.test.js +++ b/test/compatibility.test.js @@ -1,7 +1,6 @@ 'use strict' -const tap = require('tap') -const test = tap.test +const test = require('tape') const fastifyURI = require('../') const urijs = require('uri-js') diff --git a/test/equal.test.js b/test/equal.test.js index 69783de..2773268 100644 --- a/test/equal.test.js +++ b/test/equal.test.js @@ -1,7 +1,6 @@ 'use strict' -const tap = require('tap') -const test = tap.test +const test = require('tape') const URI = require('../') const fn = URI.equal diff --git a/test/parse.test.js b/test/parse.test.js index fe7c44e..ed29cc0 100644 --- a/test/parse.test.js +++ b/test/parse.test.js @@ -1,7 +1,6 @@ 'use strict' -const tap = require('tap') -const test = tap.test +const test = require('tape') const URI = require('../') test('URI parse', (t) => { diff --git a/test/resolve.test.js b/test/resolve.test.js index ab38188..69ac7b2 100644 --- a/test/resolve.test.js +++ b/test/resolve.test.js @@ -1,7 +1,6 @@ 'use strict' -const tap = require('tap') -const test = tap.test +const test = require('tape') const URI = require('../') test('URI Resolving', (t) => { diff --git a/test/serialize.test.js b/test/serialize.test.js index db84820..8d97825 100644 --- a/test/serialize.test.js +++ b/test/serialize.test.js @@ -1,7 +1,6 @@ 'use strict' -const tap = require('tap') -const test = tap.test +const test = require('tape') const URI = require('../') test('URI Serialize', (t) => { diff --git a/test/uri-js.test.js b/test/uri-js.test.js index 9a44223..67ac748 100644 --- a/test/uri-js.test.js +++ b/test/uri-js.test.js @@ -1,27 +1,6 @@ 'use strict' -const { - ok, - same: deepEqual, - strictSame: strictEqual, - notSame: notStrictEqual, - test: tapTest -} = require('tap') - -const test = function () { - if (typeof arguments[2] === 'function') { - tapTest(arguments[0], arguments[1], t => { - arguments[2](t) - t.end() - }) - } else { - tapTest(arguments[0], t => { - arguments[1](t) - t.end() - }) - } -} - +const test = require('tape') const URI = require('../index') /** @@ -60,260 +39,249 @@ const URI = require('../index') * or implied, of Gary Court. */ -test('Acquire URI', function () { - // URI = require("./uri").URI; - ok(URI) +test('Acquire URI', (t) => { + t.ok(URI) + t.end() }) -test('URI Parsing', function () { +test('URI Parsing', (t) => { let components // scheme components = URI.parse('uri:') - strictEqual(components.error, undefined, 'scheme errors') - strictEqual(components.scheme, 'uri', 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'scheme errors') + t.equal(components.scheme, 'uri', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // userinfo components = URI.parse('//@') - strictEqual(components.error, undefined, 'userinfo errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, "@", "authority"); - strictEqual(components.userinfo, '', 'userinfo') - strictEqual(components.host, '', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'userinfo errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, '', 'userinfo') + t.equal(components.host, '', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // host components = URI.parse('//') - strictEqual(components.error, undefined, 'host errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, "", "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'host errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // port components = URI.parse('//:') - strictEqual(components.error, undefined, 'port errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, ":", "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '', 'host') - strictEqual(components.port, '', 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'port errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '', 'host') + t.equal(components.port, '', 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // path components = URI.parse('') - strictEqual(components.error, undefined, 'path errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'path errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // query components = URI.parse('?') - strictEqual(components.error, undefined, 'query errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, '', 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'query errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, '', 'query') + t.equal(components.fragment, undefined, 'fragment') // fragment components = URI.parse('#') - strictEqual(components.error, undefined, 'fragment errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, '', 'fragment') + t.equal(components.error, undefined, 'fragment errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, '', 'fragment') // fragment with character tabulation components = URI.parse('#\t') - strictEqual(components.error, undefined, 'path errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, '%09', 'fragment') + t.equal(components.error, undefined, 'path errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, '%09', 'fragment') // fragment with line feed components = URI.parse('#\n') - strictEqual(components.error, undefined, 'path errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, '%0A', 'fragment') + t.equal(components.error, undefined, 'path errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, '%0A', 'fragment') // fragment with line tabulation components = URI.parse('#\v') - strictEqual(components.error, undefined, 'path errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, '%0B', 'fragment') + t.equal(components.error, undefined, 'path errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, '%0B', 'fragment') // fragment with form feed components = URI.parse('#\f') - strictEqual(components.error, undefined, 'path errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, '%0C', 'fragment') + t.equal(components.error, undefined, 'path errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, '%0C', 'fragment') // fragment with carriage return components = URI.parse('#\r') - strictEqual(components.error, undefined, 'path errors') - strictEqual(components.scheme, undefined, 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, '%0D', 'fragment') + t.equal(components.error, undefined, 'path errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, '%0D', 'fragment') // all components = URI.parse('uri://user:pass@example.com:123/one/two.three?q1=a1&q2=a2#body') - strictEqual(components.error, undefined, 'all errors') - strictEqual(components.scheme, 'uri', 'scheme') - // strictEqual(components.authority, "user:pass@example.com:123", "authority"); - strictEqual(components.userinfo, 'user:pass', 'userinfo') - strictEqual(components.host, 'example.com', 'host') - strictEqual(components.port, 123, 'port') - strictEqual(components.path, '/one/two.three', 'path') - strictEqual(components.query, 'q1=a1&q2=a2', 'query') - strictEqual(components.fragment, 'body', 'fragment') + t.equal(components.error, undefined, 'all errors') + t.equal(components.scheme, 'uri', 'scheme') + t.equal(components.userinfo, 'user:pass', 'userinfo') + t.equal(components.host, 'example.com', 'host') + t.equal(components.port, 123, 'port') + t.equal(components.path, '/one/two.three', 'path') + t.equal(components.query, 'q1=a1&q2=a2', 'query') + t.equal(components.fragment, 'body', 'fragment') // IPv4address components = URI.parse('//10.10.10.10') - strictEqual(components.error, undefined, 'IPv4address errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '10.10.10.10', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv4address errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '10.10.10.10', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // IPv6address components = URI.parse('//[2001:db8::7]') - strictEqual(components.error, undefined, 'IPv4address errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '2001:db8::7', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv4address errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '2001:db8::7', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // mixed IPv4address & IPv6address components = URI.parse('//[::ffff:129.144.52.38]') - strictEqual(components.error, undefined, 'IPv4address errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '::ffff:129.144.52.38', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv4address errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '::ffff:129.144.52.38', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // mixed IPv4address & reg-name, example from terion-name (https://github.com/garycourt/uri-js/issues/4) components = URI.parse('uri://10.10.10.10.example.com/en/process') - strictEqual(components.error, undefined, 'mixed errors') - strictEqual(components.scheme, 'uri', 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '10.10.10.10.example.com', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '/en/process', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'mixed errors') + t.equal(components.scheme, 'uri', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '10.10.10.10.example.com', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '/en/process', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // IPv6address, example from bkw (https://github.com/garycourt/uri-js/pull/16) components = URI.parse('//[2606:2800:220:1:248:1893:25c8:1946]/test') - strictEqual(components.error, undefined, 'IPv6address errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '2606:2800:220:1:248:1893:25c8:1946', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '/test', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv6address errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '2606:2800:220:1:248:1893:25c8:1946', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '/test', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // IPv6address, example from RFC 5952 components = URI.parse('//[2001:db8::1]:80') - strictEqual(components.error, undefined, 'IPv6address errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '2001:db8::1', 'host') - strictEqual(components.port, 80, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv6address errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '2001:db8::1', 'host') + t.equal(components.port, 80, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // IPv6address with zone identifier, RFC 6874 components = URI.parse('//[fe80::a%25en1]') - strictEqual(components.error, undefined, 'IPv4address errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, 'fe80::a%en1', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv4address errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, 'fe80::a%en1', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') // IPv6address with an unescaped interface specifier, example from pekkanikander (https://github.com/garycourt/uri-js/pull/22) components = URI.parse('//[2001:db8::7%en0]') - strictEqual(components.error, undefined, 'IPv6address interface errors') - strictEqual(components.scheme, undefined, 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, '2001:db8::7%en0', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, '', 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') + t.equal(components.error, undefined, 'IPv6address interface errors') + t.equal(components.scheme, undefined, 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, '2001:db8::7%en0', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, '', 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + + t.end() }) -test('URI Serialization', function () { +test('URI Serialization', (t) => { let components = { scheme: undefined, userinfo: undefined, @@ -323,7 +291,7 @@ test('URI Serialization', function () { query: undefined, fragment: undefined } - strictEqual(URI.serialize(components), '', 'Undefined Components') + t.equal(URI.serialize(components), '', 'Undefined Components') components = { scheme: '', @@ -334,7 +302,7 @@ test('URI Serialization', function () { query: '', fragment: '' } - strictEqual(URI.serialize(components), '//@:0?#', 'Empty Components') + t.equal(URI.serialize(components), '//@:0?#', 'Empty Components') components = { scheme: 'uri', @@ -345,172 +313,177 @@ test('URI Serialization', function () { query: 'query', fragment: 'fragment' } - strictEqual(URI.serialize(components), 'uri://foo:bar@example.com:1/path?query#fragment', 'All Components') + t.equal(URI.serialize(components), 'uri://foo:bar@example.com:1/path?query#fragment', 'All Components') components = { scheme: 'uri', host: 'example.com', port: '9000' } - strictEqual(URI.serialize(components), 'uri://example.com:9000', 'String port') + t.equal(URI.serialize(components), 'uri://example.com:9000', 'String port') - strictEqual(URI.serialize({ path: '//path' }), '/%2Fpath', 'Double slash path') - strictEqual(URI.serialize({ path: 'foo:bar' }), 'foo%3Abar', 'Colon path') - strictEqual(URI.serialize({ path: '?query' }), '%3Fquery', 'Query path') + t.equal(URI.serialize({ path: '//path' }), '/%2Fpath', 'Double slash path') + t.equal(URI.serialize({ path: 'foo:bar' }), 'foo%3Abar', 'Colon path') + t.equal(URI.serialize({ path: '?query' }), '%3Fquery', 'Query path') // mixed IPv4address & reg-name, example from terion-name (https://github.com/garycourt/uri-js/issues/4) - strictEqual(URI.serialize({ host: '10.10.10.10.example.com' }), '//10.10.10.10.example.com', 'Mixed IPv4address & reg-name') + t.equal(URI.serialize({ host: '10.10.10.10.example.com' }), '//10.10.10.10.example.com', 'Mixed IPv4address & reg-name') // IPv6address - strictEqual(URI.serialize({ host: '2001:db8::7' }), '//[2001:db8::7]', 'IPv6 Host') - strictEqual(URI.serialize({ host: '::ffff:129.144.52.38' }), '//[::ffff:129.144.52.38]', 'IPv6 Mixed Host') - strictEqual(URI.serialize({ host: '2606:2800:220:1:248:1893:25c8:1946' }), '//[2606:2800:220:1:248:1893:25c8:1946]', 'IPv6 Full Host') + t.equal(URI.serialize({ host: '2001:db8::7' }), '//[2001:db8::7]', 'IPv6 Host') + t.equal(URI.serialize({ host: '::ffff:129.144.52.38' }), '//[::ffff:129.144.52.38]', 'IPv6 Mixed Host') + t.equal(URI.serialize({ host: '2606:2800:220:1:248:1893:25c8:1946' }), '//[2606:2800:220:1:248:1893:25c8:1946]', 'IPv6 Full Host') // IPv6address with zone identifier, RFC 6874 - strictEqual(URI.serialize({ host: 'fe80::a%en1' }), '//[fe80::a%25en1]', 'IPv6 Zone Unescaped Host') - strictEqual(URI.serialize({ host: 'fe80::a%25en1' }), '//[fe80::a%25en1]', 'IPv6 Zone Escaped Host') + t.equal(URI.serialize({ host: 'fe80::a%en1' }), '//[fe80::a%25en1]', 'IPv6 Zone Unescaped Host') + t.equal(URI.serialize({ host: 'fe80::a%25en1' }), '//[fe80::a%25en1]', 'IPv6 Zone Escaped Host') + + t.end() }) -test('URI Resolving', { skip: true }, function () { +test('URI Resolving', { skip: true }, (t) => { // normal examples from RFC 3986 const base = 'uri://a/b/c/d;p?q' - strictEqual(URI.resolve(base, 'g:h'), 'g:h', 'g:h') - strictEqual(URI.resolve(base, 'g:h'), 'g:h', 'g:h') - strictEqual(URI.resolve(base, 'g'), 'uri://a/b/c/g', 'g') - strictEqual(URI.resolve(base, './g'), 'uri://a/b/c/g', './g') - strictEqual(URI.resolve(base, 'g/'), 'uri://a/b/c/g/', 'g/') - strictEqual(URI.resolve(base, '/g'), 'uri://a/g', '/g') - strictEqual(URI.resolve(base, '//g'), 'uri://g', '//g') - strictEqual(URI.resolve(base, '?y'), 'uri://a/b/c/d;p?y', '?y') - strictEqual(URI.resolve(base, 'g?y'), 'uri://a/b/c/g?y', 'g?y') - strictEqual(URI.resolve(base, '#s'), 'uri://a/b/c/d;p?q#s', '#s') - strictEqual(URI.resolve(base, 'g#s'), 'uri://a/b/c/g#s', 'g#s') - strictEqual(URI.resolve(base, 'g?y#s'), 'uri://a/b/c/g?y#s', 'g?y#s') - strictEqual(URI.resolve(base, ';x'), 'uri://a/b/c/;x', ';x') - strictEqual(URI.resolve(base, 'g;x'), 'uri://a/b/c/g;x', 'g;x') - strictEqual(URI.resolve(base, 'g;x?y#s'), 'uri://a/b/c/g;x?y#s', 'g;x?y#s') - strictEqual(URI.resolve(base, ''), 'uri://a/b/c/d;p?q', '') - strictEqual(URI.resolve(base, '.'), 'uri://a/b/c/', '.') - strictEqual(URI.resolve(base, './'), 'uri://a/b/c/', './') - strictEqual(URI.resolve(base, '..'), 'uri://a/b/', '..') - strictEqual(URI.resolve(base, '../'), 'uri://a/b/', '../') - strictEqual(URI.resolve(base, '../g'), 'uri://a/b/g', '../g') - strictEqual(URI.resolve(base, '../..'), 'uri://a/', '../..') - strictEqual(URI.resolve(base, '../../'), 'uri://a/', '../../') - strictEqual(URI.resolve(base, '../../g'), 'uri://a/g', '../../g') + t.equal(URI.resolve(base, 'g:h'), 'g:h', 'g:h') + t.equal(URI.resolve(base, 'g'), 'uri://a/b/c/g', 'g') + t.equal(URI.resolve(base, './g'), 'uri://a/b/c/g', './g') + t.equal(URI.resolve(base, 'g/'), 'uri://a/b/c/g/', 'g/') + t.equal(URI.resolve(base, '/g'), 'uri://a/g', '/g') + t.equal(URI.resolve(base, '//g'), 'uri://g', '//g') + t.equal(URI.resolve(base, '?y'), 'uri://a/b/c/d;p?y', '?y') + t.equal(URI.resolve(base, 'g?y'), 'uri://a/b/c/g?y', 'g?y') + t.equal(URI.resolve(base, '#s'), 'uri://a/b/c/d;p?q#s', '#s') + t.equal(URI.resolve(base, 'g#s'), 'uri://a/b/c/g#s', 'g#s') + t.equal(URI.resolve(base, 'g?y#s'), 'uri://a/b/c/g?y#s', 'g?y#s') + t.equal(URI.resolve(base, ';x'), 'uri://a/b/c/;x', ';x') + t.equal(URI.resolve(base, 'g;x'), 'uri://a/b/c/g;x', 'g;x') + t.equal(URI.resolve(base, 'g;x?y#s'), 'uri://a/b/c/g;x?y#s', 'g;x?y#s') + t.equal(URI.resolve(base, ''), 'uri://a/b/c/d;p?q', '') + t.equal(URI.resolve(base, '.'), 'uri://a/b/c/', '.') + t.equal(URI.resolve(base, './'), 'uri://a/b/c/', './') + t.equal(URI.resolve(base, '..'), 'uri://a/b/', '..') + t.equal(URI.resolve(base, '../'), 'uri://a/b/', '../') + t.equal(URI.resolve(base, '../g'), 'uri://a/b/g', '../g') + t.equal(URI.resolve(base, '../..'), 'uri://a/', '../..') + t.equal(URI.resolve(base, '../../'), 'uri://a/', '../../') + t.equal(URI.resolve(base, '../../g'), 'uri://a/g', '../../g') // abnormal examples from RFC 3986 - strictEqual(URI.resolve(base, '../../../g'), 'uri://a/g', '../../../g') - strictEqual(URI.resolve(base, '../../../../g'), 'uri://a/g', '../../../../g') - - strictEqual(URI.resolve(base, '/./g'), 'uri://a/g', '/./g') - strictEqual(URI.resolve(base, '/../g'), 'uri://a/g', '/../g') - strictEqual(URI.resolve(base, 'g.'), 'uri://a/b/c/g.', 'g.') - strictEqual(URI.resolve(base, '.g'), 'uri://a/b/c/.g', '.g') - strictEqual(URI.resolve(base, 'g..'), 'uri://a/b/c/g..', 'g..') - strictEqual(URI.resolve(base, '..g'), 'uri://a/b/c/..g', '..g') - - strictEqual(URI.resolve(base, './../g'), 'uri://a/b/g', './../g') - strictEqual(URI.resolve(base, './g/.'), 'uri://a/b/c/g/', './g/.') - strictEqual(URI.resolve(base, 'g/./h'), 'uri://a/b/c/g/h', 'g/./h') - strictEqual(URI.resolve(base, 'g/../h'), 'uri://a/b/c/h', 'g/../h') - strictEqual(URI.resolve(base, 'g;x=1/./y'), 'uri://a/b/c/g;x=1/y', 'g;x=1/./y') - strictEqual(URI.resolve(base, 'g;x=1/../y'), 'uri://a/b/c/y', 'g;x=1/../y') - - strictEqual(URI.resolve(base, 'g?y/./x'), 'uri://a/b/c/g?y/./x', 'g?y/./x') - strictEqual(URI.resolve(base, 'g?y/../x'), 'uri://a/b/c/g?y/../x', 'g?y/../x') - strictEqual(URI.resolve(base, 'g#s/./x'), 'uri://a/b/c/g#s/./x', 'g#s/./x') - strictEqual(URI.resolve(base, 'g#s/../x'), 'uri://a/b/c/g#s/../x', 'g#s/../x') - - strictEqual(URI.resolve(base, 'uri:g'), 'uri:g', 'uri:g') - strictEqual(URI.resolve(base, 'uri:g', { tolerant: true }), 'uri://a/b/c/g', 'uri:g') + t.equal(URI.resolve(base, '../../../g'), 'uri://a/g', '../../../g') + t.equal(URI.resolve(base, '../../../../g'), 'uri://a/g', '../../../../g') + + t.equal(URI.resolve(base, '/./g'), 'uri://a/g', '/./g') + t.equal(URI.resolve(base, '/../g'), 'uri://a/g', '/../g') + t.equal(URI.resolve(base, 'g.'), 'uri://a/b/c/g.', 'g.') + t.equal(URI.resolve(base, '.g'), 'uri://a/b/c/.g', '.g') + t.equal(URI.resolve(base, 'g..'), 'uri://a/b/c/g..', 'g..') + t.equal(URI.resolve(base, '..g'), 'uri://a/b/c/..g', '..g') + + t.equal(URI.resolve(base, './../g'), 'uri://a/b/g', './../g') + t.equal(URI.resolve(base, './g/.'), 'uri://a/b/c/g/', './g/.') + t.equal(URI.resolve(base, 'g/./h'), 'uri://a/b/c/g/h', 'g/./h') + t.equal(URI.resolve(base, 'g/../h'), 'uri://a/b/c/h', 'g/../h') + t.equal(URI.resolve(base, 'g;x=1/./y'), 'uri://a/b/c/g;x=1/y', 'g;x=1/./y') + t.equal(URI.resolve(base, 'g;x=1/../y'), 'uri://a/b/c/y', 'g;x=1/../y') + + t.equal(URI.resolve(base, 'g?y/./x'), 'uri://a/b/c/g?y/./x', 'g?y/./x') + t.equal(URI.resolve(base, 'g?y/../x'), 'uri://a/b/c/g?y/../x', 'g?y/../x') + t.equal(URI.resolve(base, 'g#s/./x'), 'uri://a/b/c/g#s/./x', 'g#s/./x') + t.equal(URI.resolve(base, 'g#s/../x'), 'uri://a/b/c/g#s/../x', 'g#s/../x') + + t.equal(URI.resolve(base, 'uri:g'), 'uri:g', 'uri:g') + t.equal(URI.resolve(base, 'uri:g', { tolerant: true }), 'uri://a/b/c/g', 'uri:g') // examples by PAEz - strictEqual(URI.resolve('//www.g.com/', '/adf\ngf'), '//www.g.com/adf%0Agf', '/adf\\ngf') - strictEqual(URI.resolve('//www.g.com/error\n/bleh/bleh', '..'), '//www.g.com/error%0A/', '//www.g.com/error\\n/bleh/bleh') + t.equal(URI.resolve('//www.g.com/', '/adf\ngf'), '//www.g.com/adf%0Agf', '/adf\\ngf') + t.equal(URI.resolve('//www.g.com/error\n/bleh/bleh', '..'), '//www.g.com/error%0A/', '//www.g.com/error\\n/bleh/bleh') + + t.end() }) -test('URI Normalizing', { skip: true }, function () { +test('URI Normalizing', { skip: true }, (t) => { // test from RFC 3987 - strictEqual(URI.normalize('uri://www.example.org/red%09ros\xE9#red'), 'uri://www.example.org/red%09ros%C3%A9#red') + t.equal(URI.normalize('uri://www.example.org/red%09ros\xE9#red'), 'uri://www.example.org/red%09ros%C3%A9#red') // IPv4address - strictEqual(URI.normalize('//192.068.001.000'), '//192.68.1.0') + t.equal(URI.normalize('//192.068.001.000'), '//192.68.1.0') // IPv6address, example from RFC 3513 - strictEqual(URI.normalize('http://[1080::8:800:200C:417A]/'), 'http://[1080::8:800:200c:417a]/') + t.equal(URI.normalize('http://[1080::8:800:200C:417A]/'), 'http://[1080::8:800:200c:417a]/') // IPv6address, examples from RFC 5952 - strictEqual(URI.normalize('//[2001:0db8::0001]/'), '//[2001:db8::1]/') - strictEqual(URI.normalize('//[2001:db8::1:0000:1]/'), '//[2001:db8::1:0:1]/') - strictEqual(URI.normalize('//[2001:db8:0:0:0:0:2:1]/'), '//[2001:db8::2:1]/') - strictEqual(URI.normalize('//[2001:db8:0:1:1:1:1:1]/'), '//[2001:db8:0:1:1:1:1:1]/') - strictEqual(URI.normalize('//[2001:0:0:1:0:0:0:1]/'), '//[2001:0:0:1::1]/') - strictEqual(URI.normalize('//[2001:db8:0:0:1:0:0:1]/'), '//[2001:db8::1:0:0:1]/') - strictEqual(URI.normalize('//[2001:DB8::1]/'), '//[2001:db8::1]/') - strictEqual(URI.normalize('//[0:0:0:0:0:ffff:192.0.2.1]/'), '//[::ffff:192.0.2.1]/') + t.equal(URI.normalize('//[2001:0db8::0001]/'), '//[2001:db8::1]/') + t.equal(URI.normalize('//[2001:db8::1:0000:1]/'), '//[2001:db8::1:0:1]/') + t.equal(URI.normalize('//[2001:db8:0:0:0:0:2:1]/'), '//[2001:db8::2:1]/') + t.equal(URI.normalize('//[2001:db8:0:1:1:1:1:1]/'), '//[2001:db8:0:1:1:1:1:1]/') + t.equal(URI.normalize('//[2001:0:0:1:0:0:0:1]/'), '//[2001:0:0:1::1]/') + t.equal(URI.normalize('//[2001:db8:0:0:1:0:0:1]/'), '//[2001:db8::1:0:0:1]/') + t.equal(URI.normalize('//[2001:DB8::1]/'), '//[2001:db8::1]/') + t.equal(URI.normalize('//[0:0:0:0:0:ffff:192.0.2.1]/'), '//[::ffff:192.0.2.1]/') // Mixed IPv4 and IPv6 address - strictEqual(URI.normalize('//[1:2:3:4:5:6:192.0.2.1]/'), '//[1:2:3:4:5:6:192.0.2.1]/') - strictEqual(URI.normalize('//[1:2:3:4:5:6:192.068.001.000]/'), '//[1:2:3:4:5:6:192.68.1.0]/') + t.equal(URI.normalize('//[1:2:3:4:5:6:192.0.2.1]/'), '//[1:2:3:4:5:6:192.0.2.1]/') + t.equal(URI.normalize('//[1:2:3:4:5:6:192.068.001.000]/'), '//[1:2:3:4:5:6:192.68.1.0]/') + + t.end() }) -test('URI Equals', function () { +test('URI Equals', (t) => { // test from RFC 3986 - strictEqual(URI.equal('example://a/b/c/%7Bfoo%7D', 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d'), true) + t.equal(URI.equal('example://a/b/c/%7Bfoo%7D', 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d'), true) // test from RFC 3987 - strictEqual(URI.equal('http://example.org/~user', 'http://example.org/%7euser'), true) + t.equal(URI.equal('http://example.org/~user', 'http://example.org/%7euser'), true) + + t.end() }) -test('Escape Component', { skip: true }, function () { +test('Escape Component', { skip: true }, (t) => { let chr for (let d = 0; d <= 129; ++d) { chr = String.fromCharCode(d) if (!chr.match(/[$&+,;=]/)) { - strictEqual(URI.escapeComponent(chr), encodeURIComponent(chr)) + t.equal(URI.escapeComponent(chr), encodeURIComponent(chr)) } else { - strictEqual(URI.escapeComponent(chr), chr) + t.equal(URI.escapeComponent(chr), chr) } } - strictEqual(URI.escapeComponent('\u00c0'), encodeURIComponent('\u00c0')) - strictEqual(URI.escapeComponent('\u07ff'), encodeURIComponent('\u07ff')) - strictEqual(URI.escapeComponent('\u0800'), encodeURIComponent('\u0800')) - strictEqual(URI.escapeComponent('\u30a2'), encodeURIComponent('\u30a2')) + t.equal(URI.escapeComponent('\u00c0'), encodeURIComponent('\u00c0')) + t.equal(URI.escapeComponent('\u07ff'), encodeURIComponent('\u07ff')) + t.equal(URI.escapeComponent('\u0800'), encodeURIComponent('\u0800')) + t.equal(URI.escapeComponent('\u30a2'), encodeURIComponent('\u30a2')) + t.end() }) -test('Unescape Component', { skip: true }, function () { +test('Unescape Component', { skip: true }, (t) => { let chr for (let d = 0; d <= 129; ++d) { chr = String.fromCharCode(d) - strictEqual(URI.unescapeComponent(encodeURIComponent(chr)), chr) + t.equal(URI.unescapeComponent(encodeURIComponent(chr)), chr) } - strictEqual(URI.unescapeComponent(encodeURIComponent('\u00c0')), '\u00c0') - strictEqual(URI.unescapeComponent(encodeURIComponent('\u07ff')), '\u07ff') - strictEqual(URI.unescapeComponent(encodeURIComponent('\u0800')), '\u0800') - strictEqual(URI.unescapeComponent(encodeURIComponent('\u30a2')), '\u30a2') + t.equal(URI.unescapeComponent(encodeURIComponent('\u00c0')), '\u00c0') + t.equal(URI.unescapeComponent(encodeURIComponent('\u07ff')), '\u07ff') + t.equal(URI.unescapeComponent(encodeURIComponent('\u0800')), '\u0800') + t.equal(URI.unescapeComponent(encodeURIComponent('\u30a2')), '\u30a2') + t.end() }) -// -// IRI -// - const IRI_OPTION = { iri: true, unicodeSupport: true } -test('IRI Parsing', { skip: true }, function () { +test('IRI Parsing', { skip: true }, (t) => { const components = URI.parse('uri://us\xA0er:pa\uD7FFss@example.com:123/o\uF900ne/t\uFDCFwo.t\uFDF0hree?q1=a1\uF8FF\uE000&q2=a2#bo\uFFEFdy', IRI_OPTION) - strictEqual(components.error, undefined, 'all errors') - strictEqual(components.scheme, 'uri', 'scheme') - // strictEqual(components.authority, "us\xA0er:pa\uD7FFss@example.com:123", "authority"); - strictEqual(components.userinfo, 'us\xA0er:pa\uD7FFss', 'userinfo') - strictEqual(components.host, 'example.com', 'host') - strictEqual(components.port, 123, 'port') - strictEqual(components.path, '/o\uF900ne/t\uFDCFwo.t\uFDF0hree', 'path') - strictEqual(components.query, 'q1=a1\uF8FF\uE000&q2=a2', 'query') - strictEqual(components.fragment, 'bo\uFFEFdy', 'fragment') + t.equal(components.error, undefined, 'all errors') + t.equal(components.scheme, 'uri', 'scheme') + t.equal(components.userinfo, 'us\xA0er:pa\uD7FFss', 'userinfo') + t.equal(components.host, 'example.com', 'host') + t.equal(components.port, 123, 'port') + t.equal(components.path, '/o\uF900ne/t\uFDCFwo.t\uFDF0hree', 'path') + t.equal(components.query, 'q1=a1\uF8FF\uE000&q2=a2', 'query') + t.equal(components.fragment, 'bo\uFFEFdy', 'fragment') + t.end() }) -test('IRI Serialization', { skip: true }, function () { +test('IRI Serialization', { skip: true }, (t) => { const components = { scheme: 'uri', userinfo: 'us\xA0er:pa\uD7FFss', @@ -520,421 +493,420 @@ test('IRI Serialization', { skip: true }, function () { query: 'q1=a1\uF8FF\uE000&q2=a2', fragment: 'bo\uFFEFdy\uE001' } - strictEqual(URI.serialize(components, IRI_OPTION), 'uri://us\xA0er:pa\uD7FFss@example.com:123/o\uF900ne/t\uFDCFwo.t\uFDF0hree?q1=a1\uF8FF\uE000&q2=a2#bo\uFFEFdy%EE%80%81') + t.equal(URI.serialize(components, IRI_OPTION), 'uri://us\xA0er:pa\uD7FFss@example.com:123/o\uF900ne/t\uFDCFwo.t\uFDF0hree?q1=a1\uF8FF\uE000&q2=a2#bo\uFFEFdy%EE%80%81') + t.end() }) -test('IRI Normalizing', { skip: true }, function () { - strictEqual(URI.normalize('uri://www.example.org/red%09ros\xE9#red', IRI_OPTION), 'uri://www.example.org/red%09ros\xE9#red') +test('IRI Normalizing', { skip: true }, (t) => { + t.equal(URI.normalize('uri://www.example.org/red%09ros\xE9#red', IRI_OPTION), 'uri://www.example.org/red%09ros\xE9#red') + t.end() }) -test('IRI Equals', { skip: true }, function () { +test('IRI Equals', { skip: true }, (t) => { // example from RFC 3987 - strictEqual(URI.equal('example://a/b/c/%7Bfoo%7D/ros\xE9', 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d/ros%C3%A9', IRI_OPTION), true) + t.equal(URI.equal('example://a/b/c/%7Bfoo%7D/ros\xE9', 'eXAMPLE://a/./b/../b/%63/%7bfoo%7d/ros%C3%A9', IRI_OPTION), true) + t.end() }) -test('Convert IRI to URI', { skip: true }, function () { +test('Convert IRI to URI', { skip: true }, (t) => { // example from RFC 3987 - strictEqual(URI.serialize(URI.parse('uri://www.example.org/red%09ros\xE9#red', IRI_OPTION)), 'uri://www.example.org/red%09ros%C3%A9#red') + t.equal(URI.serialize(URI.parse('uri://www.example.org/red%09ros\xE9#red', IRI_OPTION)), 'uri://www.example.org/red%09ros%C3%A9#red') // Internationalized Domain Name conversion via punycode example from RFC 3987 - strictEqual(URI.serialize(URI.parse('uri://r\xE9sum\xE9.example.org', { iri: true, domainHost: true }), { domainHost: true }), 'uri://xn--rsum-bpad.example.org') + t.equal(URI.serialize(URI.parse('uri://r\xE9sum\xE9.example.org', { iri: true, domainHost: true }), { domainHost: true }), 'uri://xn--rsum-bpad.example.org') + t.end() }) -test('Convert URI to IRI', { skip: true }, function () { +test('Convert URI to IRI', { skip: true }, (t) => { // examples from RFC 3987 - strictEqual(URI.serialize(URI.parse('uri://www.example.org/D%C3%BCrst'), IRI_OPTION), 'uri://www.example.org/D\xFCrst') - strictEqual(URI.serialize(URI.parse('uri://www.example.org/D%FCrst'), IRI_OPTION), 'uri://www.example.org/D%FCrst') - strictEqual(URI.serialize(URI.parse('uri://xn--99zt52a.example.org/%e2%80%ae'), IRI_OPTION), 'uri://xn--99zt52a.example.org/%E2%80%AE') // or uri://\u7D0D\u8C46.example.org/%E2%80%AE + t.equal(URI.serialize(URI.parse('uri://www.example.org/D%C3%BCrst'), IRI_OPTION), 'uri://www.example.org/D\xFCrst') + t.equal(URI.serialize(URI.parse('uri://www.example.org/D%FCrst'), IRI_OPTION), 'uri://www.example.org/D%FCrst') + t.equal(URI.serialize(URI.parse('uri://xn--99zt52a.example.org/%e2%80%ae'), IRI_OPTION), 'uri://xn--99zt52a.example.org/%E2%80%AE') // or uri://\u7D0D\u8C46.example.org/%E2%80%AE // Internationalized Domain Name conversion via punycode example from RFC 3987 - strictEqual(URI.serialize(URI.parse('uri://xn--rsum-bpad.example.org', { domainHost: true }), { iri: true, domainHost: true }), 'uri://r\xE9sum\xE9.example.org') + t.equal(URI.serialize(URI.parse('uri://xn--rsum-bpad.example.org', { domainHost: true }), { iri: true, domainHost: true }), 'uri://r\xE9sum\xE9.example.org') + t.end() }) -// -// HTTP -// - if (URI.SCHEMES.http) { - // module("HTTP"); - - test('HTTP Equals', function () { + test('HTTP Equals', (t) => { // test from RFC 2616 - strictEqual(URI.equal('http://abc.com:80/~smith/home.html', 'http://abc.com/~smith/home.html'), true) - strictEqual(URI.equal('http://ABC.com/%7Esmith/home.html', 'http://abc.com/~smith/home.html'), true) - strictEqual(URI.equal('http://ABC.com:/%7esmith/home.html', 'http://abc.com/~smith/home.html'), true) - strictEqual(URI.equal('HTTP://ABC.COM', 'http://abc.com/'), true) + t.equal(URI.equal('http://abc.com:80/~smith/home.html', 'http://abc.com/~smith/home.html'), true) + t.equal(URI.equal('http://ABC.com/%7Esmith/home.html', 'http://abc.com/~smith/home.html'), true) + t.equal(URI.equal('http://ABC.com:/%7esmith/home.html', 'http://abc.com/~smith/home.html'), true) + t.equal(URI.equal('HTTP://ABC.COM', 'http://abc.com/'), true) // test from RFC 3986 - strictEqual(URI.equal('http://example.com:/', 'http://example.com:80/'), true) + t.equal(URI.equal('http://example.com:/', 'http://example.com:80/'), true) + t.end() }) } if (URI.SCHEMES.https) { - // module("HTTPS"); - - test('HTTPS Equals', function () { - strictEqual(URI.equal('https://example.com', 'https://example.com:443/'), true) - strictEqual(URI.equal('https://example.com:/', 'https://example.com:443/'), true) + test('HTTPS Equals', (t) => { + t.equal(URI.equal('https://example.com', 'https://example.com:443/'), true) + t.equal(URI.equal('https://example.com:/', 'https://example.com:443/'), true) + t.end() }) } -// -// URN -// - if (URI.SCHEMES.urn) { - // module("URN"); - - test('URN Parsing', function () { + test('URN Parsing', (t) => { // example from RFC 2141 const components = URI.parse('urn:foo:a123,456') - strictEqual(components.error, undefined, 'errors') - strictEqual(components.scheme, 'urn', 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - strictEqual(components.nid, 'foo', 'nid') - strictEqual(components.nss, 'a123,456', 'nss') + t.equal(components.error, undefined, 'errors') + t.equal(components.scheme, 'urn', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.equal(components.nid, 'foo', 'nid') + t.equal(components.nss, 'a123,456', 'nss') + t.end() }) - test('URN Serialization', function () { + test('URN Serialization', (t) => { // example from RFC 2141 const components = { scheme: 'urn', nid: 'foo', nss: 'a123,456' } - strictEqual(URI.serialize(components), 'urn:foo:a123,456') + t.equal(URI.serialize(components), 'urn:foo:a123,456') + t.end() }) - test('URN Equals', { skip: true }, function () { + test('URN Equals', { skip: true }, (t) => { // test from RFC 2141 - strictEqual(URI.equal('urn:foo:a123,456', 'urn:foo:a123,456'), true) - strictEqual(URI.equal('urn:foo:a123,456', 'URN:foo:a123,456'), true) - strictEqual(URI.equal('urn:foo:a123,456', 'urn:FOO:a123,456'), true) - strictEqual(URI.equal('urn:foo:a123,456', 'urn:foo:A123,456'), false) - strictEqual(URI.equal('urn:foo:a123%2C456', 'URN:FOO:a123%2c456'), true) + t.equal(URI.equal('urn:foo:a123,456', 'urn:foo:a123,456'), true) + t.equal(URI.equal('urn:foo:a123,456', 'URN:foo:a123,456'), true) + t.equal(URI.equal('urn:foo:a123,456', 'urn:FOO:a123,456'), true) + t.equal(URI.equal('urn:foo:a123,456', 'urn:foo:A123,456'), false) + t.equal(URI.equal('urn:foo:a123%2C456', 'URN:FOO:a123%2c456'), true) + t.end() }) - test('URN Resolving', function () { + test('URN Resolving', (t) => { // example from epoberezkin - strictEqual(URI.resolve('', 'urn:some:ip:prop'), 'urn:some:ip:prop') - strictEqual(URI.resolve('#', 'urn:some:ip:prop'), 'urn:some:ip:prop') - strictEqual(URI.resolve('urn:some:ip:prop', 'urn:some:ip:prop'), 'urn:some:ip:prop') - strictEqual(URI.resolve('urn:some:other:prop', 'urn:some:ip:prop'), 'urn:some:ip:prop') + t.equal(URI.resolve('', 'urn:some:ip:prop'), 'urn:some:ip:prop') + t.equal(URI.resolve('#', 'urn:some:ip:prop'), 'urn:some:ip:prop') + t.equal(URI.resolve('urn:some:ip:prop', 'urn:some:ip:prop'), 'urn:some:ip:prop') + t.equal(URI.resolve('urn:some:other:prop', 'urn:some:ip:prop'), 'urn:some:ip:prop') + t.end() }) - // - // URN UUID - // - - test('UUID Parsing', function () { + test('UUID Parsing', (t) => { // example from RFC 4122 let components = URI.parse('urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6') - strictEqual(components.error, undefined, 'errors') - strictEqual(components.scheme, 'urn', 'scheme') - // strictEqual(components.authority, undefined, "authority"); - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - strictEqual(components.nid, 'uuid', 'nid') - strictEqual(components.nss, undefined, 'nss') - strictEqual(components.uuid, 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6', 'uuid') + t.equal(components.error, undefined, 'errors') + t.equal(components.scheme, 'urn', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.equal(components.nid, 'uuid', 'nid') + t.equal(components.nss, undefined, 'nss') + t.equal(components.uuid, 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6', 'uuid') components = URI.parse('urn:uuid:notauuid-7dec-11d0-a765-00a0c91e6bf6') - notStrictEqual(components.error, undefined, 'errors') + t.notEqual(components.error, undefined, 'errors') + t.end() }) - test('UUID Serialization', function () { + test('UUID Serialization', (t) => { // example from RFC 4122 let components = { scheme: 'urn', nid: 'uuid', uuid: 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6' } - strictEqual(URI.serialize(components), 'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6') + t.equal(URI.serialize(components), 'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6') components = { scheme: 'urn', nid: 'uuid', uuid: 'notauuid-7dec-11d0-a765-00a0c91e6bf6' } - strictEqual(URI.serialize(components), 'urn:uuid:notauuid-7dec-11d0-a765-00a0c91e6bf6') + t.equal(URI.serialize(components), 'urn:uuid:notauuid-7dec-11d0-a765-00a0c91e6bf6') + t.end() }) - test('UUID Equals', function () { - strictEqual(URI.equal('URN:UUID:F81D4FAE-7DEC-11D0-A765-00A0C91E6BF6', 'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6'), true) + test('UUID Equals', (t) => { + t.equal(URI.equal('URN:UUID:F81D4FAE-7DEC-11D0-A765-00A0C91E6BF6', 'urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6'), true) + t.end() }) - test('URN NID Override', function () { + test('URN NID Override', (t) => { let components = URI.parse('urn:foo:f81d4fae-7dec-11d0-a765-00a0c91e6bf6', { nid: 'uuid' }) - strictEqual(components.error, undefined, 'errors') - strictEqual(components.scheme, 'urn', 'scheme') - strictEqual(components.path, undefined, 'path') - strictEqual(components.nid, 'foo', 'nid') - strictEqual(components.nss, undefined, 'nss') - strictEqual(components.uuid, 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6', 'uuid') + t.equal(components.error, undefined, 'errors') + t.equal(components.scheme, 'urn', 'scheme') + t.equal(components.path, undefined, 'path') + t.equal(components.nid, 'foo', 'nid') + t.equal(components.nss, undefined, 'nss') + t.equal(components.uuid, 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6', 'uuid') components = { scheme: 'urn', nid: 'foo', uuid: 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6' } - strictEqual(URI.serialize(components, { nid: 'uuid' }), 'urn:foo:f81d4fae-7dec-11d0-a765-00a0c91e6bf6') + t.equal(URI.serialize(components, { nid: 'uuid' }), 'urn:foo:f81d4fae-7dec-11d0-a765-00a0c91e6bf6') + t.end() }) } -// -// Mailto -// - if (URI.SCHEMES.mailto) { - // module("Mailto"); - - test('Mailto Parse', function () { + test('Mailto Parse', (t) => { let components // tests from RFC 6068 components = URI.parse('mailto:chris@example.com') - strictEqual(components.error, undefined, 'error') - strictEqual(components.scheme, 'mailto', 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, undefined, 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - deepEqual(components.to, ['chris@example.com'], 'to') - strictEqual(components.subject, undefined, 'subject') - strictEqual(components.body, undefined, 'body') - strictEqual(components.headers, undefined, 'headers') + t.equal(components.error, undefined, 'error') + t.equal(components.scheme, 'mailto', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, undefined, 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.deepEqual(components.to, ['chris@example.com'], 'to') + t.equal(components.subject, undefined, 'subject') + t.equal(components.body, undefined, 'body') + t.equal(components.headers, undefined, 'headers') components = URI.parse('mailto:infobot@example.com?subject=current-issue') - deepEqual(components.to, ['infobot@example.com'], 'to') - strictEqual(components.subject, 'current-issue', 'subject') + t.deepEqual(components.to, ['infobot@example.com'], 'to') + t.equal(components.subject, 'current-issue', 'subject') components = URI.parse('mailto:infobot@example.com?body=send%20current-issue') - deepEqual(components.to, ['infobot@example.com'], 'to') - strictEqual(components.body, 'send current-issue', 'body') + t.deepEqual(components.to, ['infobot@example.com'], 'to') + t.equal(components.body, 'send current-issue', 'body') components = URI.parse('mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index') - deepEqual(components.to, ['infobot@example.com'], 'to') - strictEqual(components.body, 'send current-issue\x0D\x0Asend index', 'body') + t.deepEqual(components.to, ['infobot@example.com'], 'to') + t.equal(components.body, 'send current-issue\x0D\x0Asend index', 'body') components = URI.parse('mailto:list@example.org?In-Reply-To=%3C3469A91.D10AF4C@example.com%3E') - deepEqual(components.to, ['list@example.org'], 'to') - deepEqual(components.headers, { 'In-Reply-To': '<3469A91.D10AF4C@example.com>' }, 'headers') + t.deepEqual(components.to, ['list@example.org'], 'to') + t.deepEqual(components.headers, { 'In-Reply-To': '<3469A91.D10AF4C@example.com>' }, 'headers') components = URI.parse('mailto:majordomo@example.com?body=subscribe%20bamboo-l') - deepEqual(components.to, ['majordomo@example.com'], 'to') - strictEqual(components.body, 'subscribe bamboo-l', 'body') + t.deepEqual(components.to, ['majordomo@example.com'], 'to') + t.equal(components.body, 'subscribe bamboo-l', 'body') components = URI.parse('mailto:joe@example.com?cc=bob@example.com&body=hello') - deepEqual(components.to, ['joe@example.com'], 'to') - strictEqual(components.body, 'hello', 'body') - deepEqual(components.headers, { cc: 'bob@example.com' }, 'headers') + t.deepEqual(components.to, ['joe@example.com'], 'to') + t.equal(components.body, 'hello', 'body') + t.deepEqual(components.headers, { cc: 'bob@example.com' }, 'headers') components = URI.parse('mailto:joe@example.com?cc=bob@example.com?body=hello') - if (URI.VALIDATE_SUPPORT) ok(components.error, 'invalid header fields') + if (URI.VALIDATE_SUPPORT) t.ok(components.error, 'invalid header fields') components = URI.parse('mailto:gorby%25kremvax@example.com') - deepEqual(components.to, ['gorby%kremvax@example.com'], 'to gorby%kremvax@example.com') + t.deepEqual(components.to, ['gorby%kremvax@example.com'], 'to gorby%kremvax@example.com') components = URI.parse('mailto:unlikely%3Faddress@example.com?blat=foop') - deepEqual(components.to, ['unlikely?address@example.com'], 'to unlikely?address@example.com') - deepEqual(components.headers, { blat: 'foop' }, 'headers') + t.deepEqual(components.to, ['unlikely?address@example.com'], 'to unlikely?address@example.com') + t.deepEqual(components.headers, { blat: 'foop' }, 'headers') components = URI.parse('mailto:Mike%26family@example.org') - deepEqual(components.to, ['Mike&family@example.org'], 'to Mike&family@example.org') + t.deepEqual(components.to, ['Mike&family@example.org'], 'to Mike&family@example.org') components = URI.parse('mailto:%22not%40me%22@example.org') - deepEqual(components.to, ['"not@me"@example.org'], 'to ' + '"not@me"@example.org') + t.deepEqual(components.to, ['"not@me"@example.org'], 'to ' + '"not@me"@example.org') components = URI.parse('mailto:%22oh%5C%5Cno%22@example.org') - deepEqual(components.to, ['"oh\\\\no"@example.org'], 'to ' + '"oh\\\\no"@example.org') + t.deepEqual(components.to, ['"oh\\\\no"@example.org'], 'to ' + '"oh\\\\no"@example.org') components = URI.parse("mailto:%22%5C%5C%5C%22it's%5C%20ugly%5C%5C%5C%22%22@example.org") - deepEqual(components.to, ['"\\\\\\"it\'s\\ ugly\\\\\\""@example.org'], 'to ' + '"\\\\\\"it\'s\\ ugly\\\\\\""@example.org') + t.deepEqual(components.to, ['"\\\\\\"it\'s\\ ugly\\\\\\""@example.org'], 'to ' + '"\\\\\\"it\'s\\ ugly\\\\\\""@example.org') components = URI.parse('mailto:user@example.org?subject=caf%C3%A9') - deepEqual(components.to, ['user@example.org'], 'to') - strictEqual(components.subject, 'caf\xE9', 'subject') + t.deepEqual(components.to, ['user@example.org'], 'to') + t.equal(components.subject, 'caf\xE9', 'subject') components = URI.parse('mailto:user@example.org?subject=%3D%3Futf-8%3FQ%3Fcaf%3DC3%3DA9%3F%3D') - deepEqual(components.to, ['user@example.org'], 'to') - strictEqual(components.subject, '=?utf-8?Q?caf=C3=A9?=', 'subject') // TODO: Verify this + t.deepEqual(components.to, ['user@example.org'], 'to') + t.equal(components.subject, '=?utf-8?Q?caf=C3=A9?=', 'subject') // TODO: Verify this components = URI.parse('mailto:user@example.org?subject=%3D%3Fiso-8859-1%3FQ%3Fcaf%3DE9%3F%3D') - deepEqual(components.to, ['user@example.org'], 'to') - strictEqual(components.subject, '=?iso-8859-1?Q?caf=E9?=', 'subject') // TODO: Verify this + t.deepEqual(components.to, ['user@example.org'], 'to') + t.equal(components.subject, '=?iso-8859-1?Q?caf=E9?=', 'subject') // TODO: Verify this components = URI.parse('mailto:user@example.org?subject=caf%C3%A9&body=caf%C3%A9') - deepEqual(components.to, ['user@example.org'], 'to') - strictEqual(components.subject, 'caf\xE9', 'subject') - strictEqual(components.body, 'caf\xE9', 'body') + t.deepEqual(components.to, ['user@example.org'], 'to') + t.equal(components.subject, 'caf\xE9', 'subject') + t.equal(components.body, 'caf\xE9', 'body') if (URI.IRI_SUPPORT) { components = URI.parse('mailto:user@%E7%B4%8D%E8%B1%86.example.org?subject=Test&body=NATTO') - deepEqual(components.to, ['user@xn--99zt52a.example.org'], 'to') - strictEqual(components.subject, 'Test', 'subject') - strictEqual(components.body, 'NATTO', 'body') + t.deepEqual(components.to, ['user@xn--99zt52a.example.org'], 'to') + t.equal(components.subject, 'Test', 'subject') + t.equal(components.body, 'NATTO', 'body') } + + t.end() }) - test('Mailto Serialize', function () { + test('Mailto Serialize', (t) => { // tests from RFC 6068 - strictEqual(URI.serialize({ scheme: 'mailto', to: ['chris@example.com'] }), 'mailto:chris@example.com') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['infobot@example.com'], body: 'current-issue' }), 'mailto:infobot@example.com?body=current-issue') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['infobot@example.com'], body: 'send current-issue' }), 'mailto:infobot@example.com?body=send%20current-issue') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['infobot@example.com'], body: 'send current-issue\x0D\x0Asend index' }), 'mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['list@example.org'], headers: { 'In-Reply-To': '<3469A91.D10AF4C@example.com>' } }), 'mailto:list@example.org?In-Reply-To=%3C3469A91.D10AF4C@example.com%3E') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['majordomo@example.com'], body: 'subscribe bamboo-l' }), 'mailto:majordomo@example.com?body=subscribe%20bamboo-l') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['joe@example.com'], headers: { cc: 'bob@example.com', body: 'hello' } }), 'mailto:joe@example.com?cc=bob@example.com&body=hello') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['gorby%25kremvax@example.com'] }), 'mailto:gorby%25kremvax@example.com') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['unlikely%3Faddress@example.com'], headers: { blat: 'foop' } }), 'mailto:unlikely%3Faddress@example.com?blat=foop') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['Mike&family@example.org'] }), 'mailto:Mike%26family@example.org') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['"not@me"@example.org'] }), 'mailto:%22not%40me%22@example.org') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['"oh\\\\no"@example.org'] }), 'mailto:%22oh%5C%5Cno%22@example.org') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['"\\\\\\"it\'s\\ ugly\\\\\\""@example.org'] }), "mailto:%22%5C%5C%5C%22it's%5C%20ugly%5C%5C%5C%22%22@example.org") - strictEqual(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: 'caf\xE9' }), 'mailto:user@example.org?subject=caf%C3%A9') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: '=?utf-8?Q?caf=C3=A9?=' }), 'mailto:user@example.org?subject=%3D%3Futf-8%3FQ%3Fcaf%3DC3%3DA9%3F%3D') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: '=?iso-8859-1?Q?caf=E9?=' }), 'mailto:user@example.org?subject=%3D%3Fiso-8859-1%3FQ%3Fcaf%3DE9%3F%3D') - strictEqual(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: 'caf\xE9', body: 'caf\xE9' }), 'mailto:user@example.org?subject=caf%C3%A9&body=caf%C3%A9') + t.equal(URI.serialize({ scheme: 'mailto', to: ['chris@example.com'] }), 'mailto:chris@example.com') + t.equal(URI.serialize({ scheme: 'mailto', to: ['infobot@example.com'], body: 'current-issue' }), 'mailto:infobot@example.com?body=current-issue') + t.equal(URI.serialize({ scheme: 'mailto', to: ['infobot@example.com'], body: 'send current-issue' }), 'mailto:infobot@example.com?body=send%20current-issue') + t.equal(URI.serialize({ scheme: 'mailto', to: ['infobot@example.com'], body: 'send current-issue\x0D\x0Asend index' }), 'mailto:infobot@example.com?body=send%20current-issue%0D%0Asend%20index') + t.equal(URI.serialize({ scheme: 'mailto', to: ['list@example.org'], headers: { 'In-Reply-To': '<3469A91.D10AF4C@example.com>' } }), 'mailto:list@example.org?In-Reply-To=%3C3469A91.D10AF4C@example.com%3E') + t.equal(URI.serialize({ scheme: 'mailto', to: ['majordomo@example.com'], body: 'subscribe bamboo-l' }), 'mailto:majordomo@example.com?body=subscribe%20bamboo-l') + t.equal(URI.serialize({ scheme: 'mailto', to: ['joe@example.com'], headers: { cc: 'bob@example.com', body: 'hello' } }), 'mailto:joe@example.com?cc=bob@example.com&body=hello') + t.equal(URI.serialize({ scheme: 'mailto', to: ['gorby%25kremvax@example.com'] }), 'mailto:gorby%25kremvax@example.com') + t.equal(URI.serialize({ scheme: 'mailto', to: ['unlikely%3Faddress@example.com'], headers: { blat: 'foop' } }), 'mailto:unlikely%3Faddress@example.com?blat=foop') + t.equal(URI.serialize({ scheme: 'mailto', to: ['Mike&family@example.org'] }), 'mailto:Mike%26family@example.org') + t.equal(URI.serialize({ scheme: 'mailto', to: ['"not@me"@example.org'] }), 'mailto:%22not%40me%22@example.org') + t.equal(URI.serialize({ scheme: 'mailto', to: ['"oh\\\\no"@example.org'] }), 'mailto:%22oh%5C%5Cno%22@example.org') + t.equal(URI.serialize({ scheme: 'mailto', to: ['"\\\\\\"it\'s\\ ugly\\\\\\""@example.org'] }), "mailto:%22%5C%5C%5C%22it's%5C%20ugly%5C%5C%5C%22%22@example.org") + t.equal(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: 'caf\xE9' }), 'mailto:user@example.org?subject=caf%C3%A9') + t.equal(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: '=?utf-8?Q?caf=C3=A9?=' }), 'mailto:user@example.org?subject=%3D%3Futf-8%3FQ%3Fcaf%3DC3%3DA9%3F%3D') + t.equal(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: '=?iso-8859-1?Q?caf=E9?=' }), 'mailto:user@example.org?subject=%3D%3Fiso-8859-1%3FQ%3Fcaf%3DE9%3F%3D') + t.equal(URI.serialize({ scheme: 'mailto', to: ['user@example.org'], subject: 'caf\xE9', body: 'caf\xE9' }), 'mailto:user@example.org?subject=caf%C3%A9&body=caf%C3%A9') if (URI.IRI_SUPPORT) { - strictEqual(URI.serialize({ scheme: 'mailto', to: ['us\xE9r@\u7d0d\u8c46.example.org'], subject: 'Test', body: 'NATTO' }), 'mailto:us%C3%A9r@xn--99zt52a.example.org?subject=Test&body=NATTO') + t.equal(URI.serialize({ scheme: 'mailto', to: ['us\xE9r@\u7d0d\u8c46.example.org'], subject: 'Test', body: 'NATTO' }), 'mailto:us%C3%A9r@xn--99zt52a.example.org?subject=Test&body=NATTO') } + t.end() }) - test('Mailto Equals', function () { + test('Mailto Equals', (t) => { // tests from RFC 6068 - strictEqual(URI.equal('mailto:addr1@an.example,addr2@an.example', 'mailto:?to=addr1@an.example,addr2@an.example'), true) - strictEqual(URI.equal('mailto:?to=addr1@an.example,addr2@an.example', 'mailto:addr1@an.example?to=addr2@an.example'), true) + t.equal(URI.equal('mailto:addr1@an.example,addr2@an.example', 'mailto:?to=addr1@an.example,addr2@an.example'), true) + t.equal(URI.equal('mailto:?to=addr1@an.example,addr2@an.example', 'mailto:addr1@an.example?to=addr2@an.example'), true) + t.end() }) } if (URI.SCHEMES.ws) { - // module("WS"); - - test('WS Parse', function () { + test('WS Parse', (t) => { let components // example from RFC 6455, Sec 4.1 components = URI.parse('ws://example.com/chat') - strictEqual(components.error, undefined, 'error') - strictEqual(components.scheme, 'ws', 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, 'example.com', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - strictEqual(components.resourceName, '/chat', 'resourceName') - strictEqual(components.secure, false, 'secure') + t.equal(components.error, undefined, 'error') + t.equal(components.scheme, 'ws', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, 'example.com', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.equal(components.resourceName, '/chat', 'resourceName') + t.equal(components.secure, false, 'secure') components = URI.parse('ws://example.com/foo?bar=baz') - strictEqual(components.error, undefined, 'error') - strictEqual(components.scheme, 'ws', 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, 'example.com', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - strictEqual(components.resourceName, '/foo?bar=baz', 'resourceName') - strictEqual(components.secure, false, 'secure') + t.equal(components.error, undefined, 'error') + t.equal(components.scheme, 'ws', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, 'example.com', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.equal(components.resourceName, '/foo?bar=baz', 'resourceName') + t.equal(components.secure, false, 'secure') components = URI.parse('ws://example.com/?bar=baz') - strictEqual(components.resourceName, '/?bar=baz', 'resourceName') + t.equal(components.resourceName, '/?bar=baz', 'resourceName') + + t.end() }) - test('WS Serialize', function () { - strictEqual(URI.serialize({ scheme: 'ws' }), 'ws:') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com' }), 'ws://example.com') - strictEqual(URI.serialize({ scheme: 'ws', resourceName: '/' }), 'ws:') - strictEqual(URI.serialize({ scheme: 'ws', resourceName: '/foo' }), 'ws:/foo') - strictEqual(URI.serialize({ scheme: 'ws', resourceName: '/foo?bar' }), 'ws:/foo?bar') - strictEqual(URI.serialize({ scheme: 'ws', secure: false }), 'ws:') - strictEqual(URI.serialize({ scheme: 'ws', secure: true }), 'wss:') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo' }), 'ws://example.com/foo') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar' }), 'ws://example.com/foo?bar') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com', secure: false }), 'ws://example.com') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com', secure: true }), 'wss://example.com') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar', secure: false }), 'ws://example.com/foo?bar') - strictEqual(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar', secure: true }), 'wss://example.com/foo?bar') + test('WS Serialize', (t) => { + t.equal(URI.serialize({ scheme: 'ws' }), 'ws:') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com' }), 'ws://example.com') + t.equal(URI.serialize({ scheme: 'ws', resourceName: '/' }), 'ws:') + t.equal(URI.serialize({ scheme: 'ws', resourceName: '/foo' }), 'ws:/foo') + t.equal(URI.serialize({ scheme: 'ws', resourceName: '/foo?bar' }), 'ws:/foo?bar') + t.equal(URI.serialize({ scheme: 'ws', secure: false }), 'ws:') + t.equal(URI.serialize({ scheme: 'ws', secure: true }), 'wss:') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo' }), 'ws://example.com/foo') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar' }), 'ws://example.com/foo?bar') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com', secure: false }), 'ws://example.com') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com', secure: true }), 'wss://example.com') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar', secure: false }), 'ws://example.com/foo?bar') + t.equal(URI.serialize({ scheme: 'ws', host: 'example.com', resourceName: '/foo?bar', secure: true }), 'wss://example.com/foo?bar') + t.end() }) - test('WS Equal', function () { - strictEqual(URI.equal('WS://ABC.COM:80/chat#one', 'ws://abc.com/chat'), true) + test('WS Equal', (t) => { + t.equal(URI.equal('WS://ABC.COM:80/chat#one', 'ws://abc.com/chat'), true) + t.end() }) - test('WS Normalize', function () { - strictEqual(URI.normalize('ws://example.com:80/foo#hash'), 'ws://example.com/foo') + test('WS Normalize', (t) => { + t.equal(URI.normalize('ws://example.com:80/foo#hash'), 'ws://example.com/foo') + t.end() }) } if (URI.SCHEMES.wss) { - // module("WSS"); - - test('WSS Parse', function () { + test('WSS Parse', (t) => { let components // example from RFC 6455, Sec 4.1 components = URI.parse('wss://example.com/chat') - strictEqual(components.error, undefined, 'error') - strictEqual(components.scheme, 'wss', 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, 'example.com', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - strictEqual(components.resourceName, '/chat', 'resourceName') - strictEqual(components.secure, true, 'secure') + t.equal(components.error, undefined, 'error') + t.equal(components.scheme, 'wss', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, 'example.com', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.equal(components.resourceName, '/chat', 'resourceName') + t.equal(components.secure, true, 'secure') components = URI.parse('wss://example.com/foo?bar=baz') - strictEqual(components.error, undefined, 'error') - strictEqual(components.scheme, 'wss', 'scheme') - strictEqual(components.userinfo, undefined, 'userinfo') - strictEqual(components.host, 'example.com', 'host') - strictEqual(components.port, undefined, 'port') - strictEqual(components.path, undefined, 'path') - strictEqual(components.query, undefined, 'query') - strictEqual(components.fragment, undefined, 'fragment') - strictEqual(components.resourceName, '/foo?bar=baz', 'resourceName') - strictEqual(components.secure, true, 'secure') + t.equal(components.error, undefined, 'error') + t.equal(components.scheme, 'wss', 'scheme') + t.equal(components.userinfo, undefined, 'userinfo') + t.equal(components.host, 'example.com', 'host') + t.equal(components.port, undefined, 'port') + t.equal(components.path, undefined, 'path') + t.equal(components.query, undefined, 'query') + t.equal(components.fragment, undefined, 'fragment') + t.equal(components.resourceName, '/foo?bar=baz', 'resourceName') + t.equal(components.secure, true, 'secure') components = URI.parse('wss://example.com/?bar=baz') - strictEqual(components.resourceName, '/?bar=baz', 'resourceName') + t.equal(components.resourceName, '/?bar=baz', 'resourceName') + + t.end() }) - test('WSS Serialize', function () { - strictEqual(URI.serialize({ scheme: 'wss' }), 'wss:') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com' }), 'wss://example.com') - strictEqual(URI.serialize({ scheme: 'wss', resourceName: '/' }), 'wss:') - strictEqual(URI.serialize({ scheme: 'wss', resourceName: '/foo' }), 'wss:/foo') - strictEqual(URI.serialize({ scheme: 'wss', resourceName: '/foo?bar' }), 'wss:/foo?bar') - strictEqual(URI.serialize({ scheme: 'wss', secure: false }), 'ws:') - strictEqual(URI.serialize({ scheme: 'wss', secure: true }), 'wss:') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo' }), 'wss://example.com/foo') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo?bar' }), 'wss://example.com/foo?bar') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com', secure: false }), 'ws://example.com') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com', secure: true }), 'wss://example.com') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo?bar', secure: false }), 'ws://example.com/foo?bar') - strictEqual(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo?bar', secure: true }), 'wss://example.com/foo?bar') + test('WSS Serialize', (t) => { + t.equal(URI.serialize({ scheme: 'wss' }), 'wss:') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com' }), 'wss://example.com') + t.equal(URI.serialize({ scheme: 'wss', resourceName: '/' }), 'wss:') + t.equal(URI.serialize({ scheme: 'wss', resourceName: '/foo' }), 'wss:/foo') + t.equal(URI.serialize({ scheme: 'wss', resourceName: '/foo?bar' }), 'wss:/foo?bar') + t.equal(URI.serialize({ scheme: 'wss', secure: false }), 'ws:') + t.equal(URI.serialize({ scheme: 'wss', secure: true }), 'wss:') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo' }), 'wss://example.com/foo') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo?bar' }), 'wss://example.com/foo?bar') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com', secure: false }), 'ws://example.com') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com', secure: true }), 'wss://example.com') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo?bar', secure: false }), 'ws://example.com/foo?bar') + t.equal(URI.serialize({ scheme: 'wss', host: 'example.com', resourceName: '/foo?bar', secure: true }), 'wss://example.com/foo?bar') + t.end() }) - test('WSS Equal', function () { - strictEqual(URI.equal('WSS://ABC.COM:443/chat#one', 'wss://abc.com/chat'), true) + test('WSS Equal', (t) => { + t.equal(URI.equal('WSS://ABC.COM:443/chat#one', 'wss://abc.com/chat'), true) + t.end() }) - test('WSS Normalize', function () { - strictEqual(URI.normalize('wss://example.com:443/foo#hash'), 'wss://example.com/foo') + test('WSS Normalize', (t) => { + t.equal(URI.normalize('wss://example.com:443/foo#hash'), 'wss://example.com/foo') + t.end() }) } diff --git a/test/util.test.js b/test/util.test.js index 296c662..66d515f 100644 --- a/test/util.test.js +++ b/test/util.test.js @@ -1,7 +1,6 @@ 'use strict' -const tap = require('tap') -const test = tap.test +const test = require('tape') const { stringArrayToHexStripped } = require('../lib/utils') @@ -19,6 +18,6 @@ test('stringArrayToHexStripped', (t) => { t.plan(testCases.length) testCases.forEach(([input, expected]) => { - t.strictSame(stringArrayToHexStripped(input[0], input[1]), expected) + t.same(stringArrayToHexStripped(input[0], input[1]), expected) }) })