correct failing tests

servo · Sep 1, 2018 · b1adf8e · b1adf8e
1 parent d7cb68c
commit b1adf8e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
@@ -1150,7 +1150,13 @@ impl HTMLImageElementMethods for HTMLImageElement {
         let ref url = self.current_request.borrow().parsed_url;
         match *url {
             Some(ref url) => DOMString::from_string(url.clone().into_string()),
-            None => DOMString::from(""),
+            None => {
+                let ref unparsed_url = self.current_request.borrow().source_url;
+                match *unparsed_url {
+                    Some(ref url) => url.clone(),
+                    None => DOMString::from("")
+                }
+            },
         }
     }
 

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
@@ -601198,7 +601198,7 @@
    "support"
   ],
   "html/semantics/embedded-content/the-img-element/img.complete.html": [
-   "771b8e1b80e6ad41b5cf703b5a1e99bd23b35416",
+   "4be8d4db848ad259a508e1a8091feaae7733e784",
    "testharness"
   ],
   "html/semantics/embedded-content/the-img-element/invalid-src.html": [

diff --git a/.../wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html b/.../wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/img.complete.html
@@ -38,8 +38,9 @@
       assert_false(loaded);
       loaded = true;
       assert_true(document.getElementById("imgTestTag3").complete);
-      var currentSrc = document.getElementById("imgTestTag3").currentSrc
-      assert_equals(new URL(window.location.origin + "/" + currentSrc).pathname, "/3.jpg");
+      var currentSrc = document.getElementById("imgTestTag3").currentSrc;
+      var expectedUrl = new URL("3.jpg", window.location);
+      assert_equals(new URL(currentSrc).pathname, expectedUrl.pathname);
     }, "Only one onload, despite setting the src twice");
 
     document.getElementById("imgTestTag3").src = 'test' + Math.random();