servo · bors-servo · Dec 23, 2016 · Dec 19, 2016 · Dec 19, 2016 · Dec 19, 2016
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
@@ -92,8 +92,7 @@ impl Request {
         let mut fallback_credentials: Option<NetTraitsRequestCredentials> = None;
 
         // Step 4
-        // TODO: `entry settings object` is not implemented in Servo yet.
-        let base_url = global.get_url();
+        let base_url = global.api_base_url();
 
         match input {
             // Step 5

diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs
@@ -149,8 +149,7 @@ impl Response {
     // https://fetch.spec.whatwg.org/#dom-response-redirect
     pub fn Redirect(global: &GlobalScope, url: USVString, status: u16) -> Fallible<Root<Response>> {
         // Step 1
-        // TODO: `entry settings object` is not implemented in Servo yet.
-        let base_url = global.get_url();
+        let base_url = global.api_base_url();
         let parsed_url = base_url.join(&url.0);
 
         // Step 2

diff --git a/tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini b/tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
diff --git a/tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini b/tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/current/current.html b/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/current/current.html
@@ -1,2 +1,3 @@
 <!DOCTYPE html>
 <title>Current page used as a test helper</title>
+<base href="success/">
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/incumbent/incumbent.html b/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/incumbent/incumbent.html
@@ -6,9 +6,8 @@
 <script>
 'use strict';
 
-const current = document.querySelector('#c').contentWindow;
-
 window.createRequest = (...args) => {
+    const current = document.querySelector('#c').contentWindow;
     return new current.Request(...args);
 };
 

diff --git a/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/url-parsing.html b/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/url-parsing.html
@@ -18,9 +18,9 @@
 
 promise_test(() => {
     return loadPromise.then(() => {
-        const req = frames[0].createRequest("url");
+        const req = document.querySelector('iframe').contentWindow.createRequest("url");
 
-        assert_equals(req.url, new URL("current/url", location.href).href);
+        assert_equals(req.url, new URL("current/success/url", location.href).href);
     });
 }, "should parse the URL relative to the current settings object");
 

diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/current/current.html b/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/current/current.html
@@ -1,2 +1,3 @@
 <!DOCTYPE html>
 <title>Current page used as a test helper</title>
+<base href="success/">
diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/incumbent/incumbent.html b/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/incumbent/incumbent.html
@@ -7,10 +7,9 @@
 <script>
 'use strict';
 
-const current = document.querySelector('#c').contentWindow;
-const relevant = document.querySelector('#r').contentWindow;
-
 window.createRedirectResponse = (...args) => {
+    const current = document.querySelector('#c').contentWindow;
+    const relevant = document.querySelector('#r').contentWindow;
     return current.Response.redirect.call(relevant.Response, ...args);
 };
 

diff --git a/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/url-parsing.html b/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/url-parsing.html
@@ -18,9 +18,9 @@
 
 promise_test(() => {
     return loadPromise.then(() => {
-        const res = frames[0].createRedirectResponse("url");
+        const res = document.querySelector('iframe').contentWindow.createRedirectResponse("url");
 
-        assert_equals(res.headers.get("Location"), new URL("current/url", location.href).href);
+        assert_equals(res.headers.get("Location"), new URL("current/success/url", location.href).href);
     });
 }, "should parse the redirect Location URL relative to the current settings object");