wpt: add scheme-others.sub.any.js and fix issues

Author: KhafraDev

lib/fetch/response.js

@@ -189,10 +189,12 @@ class Response {
       throw new TypeError('Illegal invocation')
     }
 
+    const urlList = this[kState].urlList
+
     // The url getter steps are to return the empty string if this’s
     // response’s URL is null; otherwise this’s response’s URL,
     // serialized with exclude fragment set to true.
-    const url = this[kState].urlList[0] ?? null
+    const url = urlList[urlList.length - 1] ?? null
 
     if (url === null) {
       return ''

lib/fetch/util.js

@@ -547,7 +547,6 @@ function bytesMatch (bytes, metadataList) {
     const expectedValue = item.hash
 
     // 3. Let actualValue be the result of applying algorithm to bytes.
-    // Note: "applying algorithm to bytes" converts the result to base64
     const actualValue = crypto.createHash(algorithm).update(bytes).digest('base64')
 
     // 4. If actualValue is a case-sensitive match for expectedValue,

test/fetch/about-uri.js

@@ -5,12 +5,7 @@ const { fetch } = require('../..')
 
 test('fetching about: uris', async (t) => {
   t.test('about:blank', async (t) => {
-    const res = await fetch('about:blank')
-
-    t.equal(res.url, 'about:blank')
-    t.equal(res.statusText, 'OK')
-    t.equal(res.headers.get('Content-Type'), 'text/html;charset=utf-8')
-    t.end()
+    await t.rejects(fetch('about:blank'))
   })
 
   t.test('All other about: urls should return an error', async (t) => {

test/fetch/integrity.js

@@ -16,7 +16,7 @@ setGlobalDispatcher(new Agent({
 
 test('request with correct integrity checksum', (t) => {
   const body = 'Hello world!'
-  const hash = createHash('sha256').update(body).digest('hex')
+  const hash = createHash('sha256').update(body).digest('base64')
 
   const server = createServer((req, res) => {
     res.end(body)
@@ -58,7 +58,7 @@ test('request with wrong integrity checksum', (t) => {
 
 test('request with integrity checksum on encoded body', (t) => {
   const body = 'Hello world!'
-  const hash = createHash('sha256').update(body).digest('hex')
+  const hash = createHash('sha256').update(body).digest('base64')
 
   const server = createServer((req, res) => {
     res.setHeader('content-encoding', 'gzip')

test/node-fetch/main.js

@@ -1532,12 +1532,12 @@ describe('node-fetch', () => {
     })
   })
 
-  it('should keep `?` sign in URL when no params are given', () => {
+  it('should NOT keep `?` sign in URL when no params are given', () => {
     const url = `${base}question?`
     const urlObject = new URL(url)
     const request = new Request(urlObject)
     return fetch(request).then(res => {
-      expect(res.url).to.equal(url)
+      expect(res.url).to.equal(url.slice(0, -1))
       expect(res.ok).to.be.true
       expect(res.status).to.equal(200)
     })
@@ -1554,12 +1554,12 @@ describe('node-fetch', () => {
     })
   })
 
-  it('should preserve the hash (#) symbol', () => {
+  it('should NOT preserve the hash (#) symbol', () => {
     const url = `${base}question?#`
     const urlObject = new URL(url)
     const request = new Request(urlObject)
     return fetch(request).then(res => {
-      expect(res.url).to.equal(url)
+      expect(res.url).to.equal(url.slice(0, -2))
       expect(res.ok).to.be.true
       expect(res.status).to.equal(200)
     })

test/node-fetch/response.js

@@ -121,7 +121,7 @@ describe('Response', () => {
       status: 346,
       statusText: 'production'
     })
-    res[kState].urlList = [base]
+    res[kState].urlList = [new URL(base)]
     const cl = res.clone()
     expect(cl.headers.get('a')).to.equal('1')
     expect(cl.type).to.equal('default')

test/wpt/tests/fetch/api/basic/scheme-others.sub.any.js

@@ -0,0 +1,31 @@
+// META: global=window,worker
+// META: script=../resources/utils.js
+
+function checkKoUrl(url, desc) {
+  if (!desc)
+    desc = "Fetching " + url.substring(0, 45) + " is KO"
+  promise_test(function(test) {
+    var promise = fetch(url);
+    return promise_rejects_js(test, TypeError, promise);
+  }, desc);
+}
+
+var urlWithoutScheme = "://{{host}}:{{ports[http][0]}}/";
+checkKoUrl("aaa" + urlWithoutScheme);
+checkKoUrl("cap" + urlWithoutScheme);
+checkKoUrl("cid" + urlWithoutScheme);
+checkKoUrl("dav" + urlWithoutScheme);
+checkKoUrl("dict" + urlWithoutScheme);
+checkKoUrl("dns" + urlWithoutScheme);
+checkKoUrl("geo" + urlWithoutScheme);
+checkKoUrl("im" + urlWithoutScheme);
+checkKoUrl("imap" + urlWithoutScheme);
+checkKoUrl("ipp" + urlWithoutScheme);
+checkKoUrl("ldap" + urlWithoutScheme);
+checkKoUrl("mailto" + urlWithoutScheme);
+checkKoUrl("nfs" + urlWithoutScheme);
+checkKoUrl("pop" + urlWithoutScheme);
+checkKoUrl("rtsp" + urlWithoutScheme);
+checkKoUrl("snmp" + urlWithoutScheme);
+
+done();