wpt: add response-url.sub.any.js

Author: KhafraDev

lib/fetch/dataURL.js

@@ -135,7 +135,7 @@ function URLSerializer (url, excludeFragment = false) {
     }
 
     // 3. Append url’s host, serialized, to output.
-    output += decodeURIComponent(url.host)
+    output += decodeURIComponent(url.hostname)
 
     // 4. If url’s port is non-null, append U+003A (:) followed by url’s port,
     // serialized, to output.

lib/fetch/request.js

@@ -24,6 +24,7 @@ const { kEnumerableProperty } = util
 const { kHeaders, kSignal, kState, kGuard, kRealm } = require('./symbols')
 const { webidl } = require('./webidl')
 const { getGlobalOrigin } = require('./global')
+const { URLSerializer } = require('./dataURL')
 const { kHeadersList } = require('../core/symbols')
 const assert = require('assert')
 
@@ -542,7 +543,7 @@ class Request {
     }
 
     // The url getter steps are to return this’s request’s URL, serialized.
-    return this[kState].url.toString()
+    return URLSerializer(this[kState].url)
   }
 
   // Returns a Headers object consisting of the headers associated with request.

lib/fetch/response.js

@@ -22,6 +22,7 @@ const { kState, kHeaders, kGuard, kRealm } = require('./symbols')
 const { webidl } = require('./webidl')
 const { FormData } = require('./formdata')
 const { getGlobalOrigin } = require('./global')
+const { URLSerializer } = require('./dataURL')
 const { kHeadersList } = require('../core/symbols')
 const assert = require('assert')
 const { types } = require('util')
@@ -192,18 +193,13 @@ class Response {
     // 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.
-    let url = responseURL(this[kState])
+    const url = this[kState].urlList[0] ?? null
 
-    if (url == null) {
+    if (url === null) {
       return ''
     }
 
-    if (url.hash) {
-      url = new URL(url)
-      url.hash = ''
-    }
-
-    return url.toString()
+    return URLSerializer(url, true)
   }
 
   // Returns whether response was obtained through a redirect.

test/wpt/runner/runner/util.mjs

@@ -110,7 +110,7 @@ export function handlePipes (code, url) {
       // "The port number of servers, by protocol e.g. {{ports[http][0]}}
       //  for the first (and, depending on setup, possibly only) http server"
       case 'ports': {
-        return `${server.port}/`
+        return server.port
       }
       default: {
         throw new TypeError(`Unknown substitute "${sub}".`)

test/wpt/tests/fetch/api/basic/response-url.sub.any.js

@@ -0,0 +1,16 @@
+function checkResponseURL(fetchedURL, expectedURL)
+{
+    promise_test(function() {
+        return fetch(fetchedURL).then(function(response) {
+            assert_equals(response.url, expectedURL);
+        });
+    }, "Testing response url getter with " +fetchedURL);
+}
+
+var baseURL = "http://{{host}}:{{ports[http][0]}}";
+checkResponseURL(baseURL + "/ada", baseURL + "/ada");
+checkResponseURL(baseURL + "/#", baseURL + "/");
+checkResponseURL(baseURL + "/#ada", baseURL + "/");
+checkResponseURL(baseURL + "#ada", baseURL + "/");
+
+done();