From b09b7e8b4c8346d3ccc4c84accbc2542c8ee94e5 Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Tue, 19 Oct 2021 21:46:15 +0900 Subject: [PATCH 1/2] test: add auth option case for url.format --- test/parallel/test-url-format-whatwg.js | 65 +++++++++++++++++-------- 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/test/parallel/test-url-format-whatwg.js b/test/parallel/test-url-format-whatwg.js index 9c86a7ae2c6910..d93d3b9a854e2b 100644 --- a/test/parallel/test-url-format-whatwg.js +++ b/test/parallel/test-url-format-whatwg.js @@ -7,16 +7,16 @@ if (!common.hasIntl) const assert = require('assert'); const url = require('url'); -const myURL = new URL('http://xn--lck1c3crb1723bpq4a.com/a?a=b#c'); +const myURL = new URL('http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c'); assert.strictEqual( url.format(myURL), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, {}), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); { @@ -36,82 +36,107 @@ assert.strictEqual( // Any falsy value other than undefined will be treated as false. // Any truthy value will be treated as true. +assert.strictEqual( + url.format(myURL, { auth: false }), + 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' +); + +assert.strictEqual( + url.format(myURL, { auth: '' }), + 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' +); + +assert.strictEqual( + url.format(myURL, { auth: 0 }), + 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' +); + +assert.strictEqual( + url.format(myURL, { auth: 1 }), + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' +); + +assert.strictEqual( + url.format(myURL, { auth: {} }), + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' +); + assert.strictEqual( url.format(myURL, { fragment: false }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b' ); assert.strictEqual( url.format(myURL, { fragment: '' }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b' ); assert.strictEqual( url.format(myURL, { fragment: 0 }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b' ); assert.strictEqual( url.format(myURL, { fragment: 1 }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { fragment: {} }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { search: false }), - 'http://xn--lck1c3crb1723bpq4a.com/a#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a#c' ); assert.strictEqual( url.format(myURL, { search: '' }), - 'http://xn--lck1c3crb1723bpq4a.com/a#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a#c' ); assert.strictEqual( url.format(myURL, { search: 0 }), - 'http://xn--lck1c3crb1723bpq4a.com/a#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a#c' ); assert.strictEqual( url.format(myURL, { search: 1 }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { search: {} }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { unicode: true }), - 'http://理容ナカムラ.com/a?a=b#c' + 'http://user:pass@理容ナカムラ.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { unicode: 1 }), - 'http://理容ナカムラ.com/a?a=b#c' + 'http://user:pass@理容ナカムラ.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { unicode: {} }), - 'http://理容ナカムラ.com/a?a=b#c' + 'http://user:pass@理容ナカムラ.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { unicode: false }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( url.format(myURL, { unicode: 0 }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( - url.format(new URL('http://xn--0zwm56d.com:8080/path'), { unicode: true }), - 'http://测试.com:8080/path' + url.format(new URL('http://user:pass@xn--0zwm56d.com:8080/path'), { unicode: true }), + 'http://user:pass@测试.com:8080/path' ); From 9f88d3b924c474e8483c63d231bccf1c963401c2 Mon Sep 17 00:00:00 2001 From: wafuwafu13 Date: Wed, 20 Oct 2021 18:08:05 +0900 Subject: [PATCH 2/2] test: fix lint --- test/parallel/test-url-format-whatwg.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/parallel/test-url-format-whatwg.js b/test/parallel/test-url-format-whatwg.js index d93d3b9a854e2b..d1f0e0bcbddec2 100644 --- a/test/parallel/test-url-format-whatwg.js +++ b/test/parallel/test-url-format-whatwg.js @@ -37,28 +37,28 @@ assert.strictEqual( // Any truthy value will be treated as true. assert.strictEqual( - url.format(myURL, { auth: false }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + url.format(myURL, { auth: false }), + 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( - url.format(myURL, { auth: '' }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + url.format(myURL, { auth: '' }), + 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( - url.format(myURL, { auth: 0 }), - 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' + url.format(myURL, { auth: 0 }), + 'http://xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( - url.format(myURL, { auth: 1 }), - 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' + url.format(myURL, { auth: 1 }), + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual( - url.format(myURL, { auth: {} }), - 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' + url.format(myURL, { auth: {} }), + 'http://user:pass@xn--lck1c3crb1723bpq4a.com/a?a=b#c' ); assert.strictEqual(