From 26cf0a7a8c97cd5af894f7eb3ea499491280ddc4 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 19 Dec 2016 19:12:38 +0100
Subject: [PATCH 1/3] Make the multi-global tests more robust.

---
 .../fetch/api/request/multi-globals/url-parsing.html.ini     | 5 -----
 .../fetch/api/response/multi-globals/url-parsing.html.ini    | 5 -----
 .../fetch/api/request/multi-globals/incumbent/incumbent.html | 3 +--
 .../fetch/api/request/multi-globals/url-parsing.html         | 2 +-
 .../api/response/multi-globals/incumbent/incumbent.html      | 5 ++---
 .../fetch/api/response/multi-globals/url-parsing.html        | 2 +-
 6 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini

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
deleted file mode 100644
index a6e5c4f239b..00000000000
--- a/tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[url-parsing.html]
-  type: testharness
-  [should parse the URL relative to the current settings object]
-    expected: FAIL
-
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
deleted file mode 100644
index ebf5ccc16d2..00000000000
--- a/tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[url-parsing.html]
-  type: testharness
-  [should parse the redirect Location URL relative to the current settings object]
-    expected: FAIL
-
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
index 8edc71cfb12..a885b8a0a73 100644
--- 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
index f20298ad628..c4ac7ce7f50 100644
--- 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,7 +18,7 @@ const loadPromise = new Promise(resolve => {
 
 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);
     });
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
index 4d1ee085440..f63372e64c2 100644
--- 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
index 73bf9cfd0ad..f810375e4e3 100644
--- 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,7 +18,7 @@ const loadPromise = new Promise(resolve => {
 
 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);
     });

From fbed4d23d67508c08fb177b88fd7458bcd046a55 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 19 Dec 2016 19:33:07 +0100
Subject: [PATCH 2/3] Ensure that the API base URL is used in Fetch APIs.

---
 .../fetch/api/request/multi-globals/url-parsing.html.ini     | 5 +++++
 .../fetch/api/response/multi-globals/url-parsing.html.ini    | 5 +++++
 .../fetch/api/request/multi-globals/current/current.html     | 1 +
 .../fetch/api/request/multi-globals/url-parsing.html         | 2 +-
 .../fetch/api/response/multi-globals/current/current.html    | 1 +
 .../fetch/api/response/multi-globals/url-parsing.html        | 2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
 create mode 100644 tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini

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
new file mode 100644
index 00000000000..a6e5c4f239b
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
@@ -0,0 +1,5 @@
+[url-parsing.html]
+  type: testharness
+  [should parse the URL relative to the current settings object]
+    expected: FAIL
+
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
new file mode 100644
index 00000000000..ebf5ccc16d2
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini
@@ -0,0 +1,5 @@
+[url-parsing.html]
+  type: testharness
+  [should parse the redirect Location URL relative to the current settings object]
+    expected: FAIL
+
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
index 82a48d40990..9bb6e0bbf3f 100644
--- 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/url-parsing.html b/tests/wpt/web-platform-tests/fetch/api/request/multi-globals/url-parsing.html
index c4ac7ce7f50..df60e72507f 100644
--- 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
@@ -20,7 +20,7 @@ promise_test(() => {
     return loadPromise.then(() => {
         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
index 82a48d40990..9bb6e0bbf3f 100644
--- 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/url-parsing.html b/tests/wpt/web-platform-tests/fetch/api/response/multi-globals/url-parsing.html
index f810375e4e3..5f2f42a1cea 100644
--- 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
@@ -20,7 +20,7 @@ promise_test(() => {
     return loadPromise.then(() => {
         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");
 

From 75be03041cc0581eb4c146bc50c64c9cffbc8d8b Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 19 Dec 2016 19:43:26 +0100
Subject: [PATCH 3/3] Use the API base URL in Fetch APIs.

---
 components/script/dom/request.rs                             | 3 +--
 components/script/dom/response.rs                            | 3 +--
 .../fetch/api/request/multi-globals/url-parsing.html.ini     | 5 -----
 .../fetch/api/response/multi-globals/url-parsing.html.ini    | 5 -----
 4 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini

diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index 74b61768a5e..8ca9104b945 100644
--- 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
index 06a066d410c..1d9d62c079a 100644
--- 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
deleted file mode 100644
index a6e5c4f239b..00000000000
--- a/tests/wpt/metadata/fetch/api/request/multi-globals/url-parsing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[url-parsing.html]
-  type: testharness
-  [should parse the URL relative to the current settings object]
-    expected: FAIL
-
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
deleted file mode 100644
index ebf5ccc16d2..00000000000
--- a/tests/wpt/metadata/fetch/api/response/multi-globals/url-parsing.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[url-parsing.html]
-  type: testharness
-  [should parse the redirect Location URL relative to the current settings object]
-    expected: FAIL
-