Auto merge of #5423 - yodalee:issue5397-location-pathname, r=jdm

issue #5397

components/script/dom/location.rs

@@ -46,6 +46,10 @@ impl<'a> LocationMethods for JSRef<'a, Location> {
         UrlHelper::Href(&self.get_url())
     }
 
+    fn Pathname(self) -> USVString {
+        UrlHelper::Pathname(&self.get_url())
+    }
+
     fn Stringify(self) -> DOMString {
         self.Href().0
     }

components/script/dom/urlhelper.rs

@@ -4,7 +4,7 @@
 
 use dom::bindings::str::USVString;
 
-use url::Url;
+use url::{Url, SchemeData};
 
 use std::borrow::ToOwned;
 
@@ -31,6 +31,15 @@ impl UrlHelper {
         })
     }
 
+    pub fn Pathname(url: &Url) -> USVString {
+        // https://url.spec.whatwg.org/#dom-urlutils-pathname
+        // FIXME: Url null check is skipped for now
+        USVString(match url.scheme_data {
+            SchemeData::NonRelative(ref scheme_data) => scheme_data.clone(),
+            SchemeData::Relative(..) => url.serialize_path().unwrap()
+        })
+    }
+
     /// https://html.spec.whatwg.org/multipage/browsers.html#same-origin
     pub fn SameOrigin(urlA: &Url, urlB: &Url) -> bool {
         if urlA.host() != urlB.host() {

components/script/dom/webidls/URLUtils.webidl

@@ -16,6 +16,7 @@ interface URLUtils {
   //         attribute USVString hostname;
   //         attribute USVString port;
   //         attribute USVString pathname;
+  readonly attribute USVString pathname;
   //         attribute USVString search;
   readonly attribute USVString search;
   //         attribute URLSearchParams searchParams;

tests/wpt/metadata/XMLHttpRequest/getresponseheader-error-state.htm.ini

@@ -1,5 +0,0 @@
-[getresponseheader-error-state.htm]
-  type: testharness
-  [XMLHttpRequest: getResponseHeader() in error state (failing cross-origin test)]
-    expected: FAIL
-

tests/wpt/metadata/XMLHttpRequest/send-redirect-to-non-cors.htm.ini

@@ -1,14 +0,0 @@
-[send-redirect-to-non-cors.htm]
-  type: testharness
-  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (301)]
-    expected: FAIL
-
-  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (302)]
-    expected: FAIL
-
-  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (303)]
-    expected: FAIL
-
-  [XMLHttpRequest: send() - Redirect to cross-origin resource, not CORS-enabled (307)]
-    expected: FAIL
-

tests/wpt/metadata/XMLHttpRequest/timeout-cors-async.htm.ini

@@ -1,6 +1,6 @@
 [timeout-cors-async.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: OK
   [XMLHttpRequest: timeout event and cross-origin request]
-    expected: NOTRUN
+    expected: FAIL
 

tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini

@@ -1,6 +1,6 @@
 [frameElement.sub.html]
   type: testharness
-  expected: ERROR
+  expected: OK
   [The window\'s frameElement attribute must return its container element if it is a nested browsing context]
     expected: FAIL
 

tests/wpt/metadata/workers/interfaces/WorkerGlobalScope/location/members.html.ini

@@ -0,0 +1,4 @@
+[members.html]
+  type: testharness
+  [members of WorkerLocation]
+    expected: FAIL