Auto merge of servo#7510 - servo:update-wpt, r=Ms2ger

Update web-platform-tests to revision cf8340b5fae7b820788ffc31f8cc6b6b04978002



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7510)
<!-- Reviewable:end -->

Author: bors-servo

tests/wpt/metadata/MANIFEST.json

@@ -0,0 +1,5 @@
+[preserve-ua-header-on-redirect.htm]
+  type: testharness
+  [XMLHttpRequest: User-Agent header is preserved on redirect 1]
+    expected: FAIL
+

tests/wpt/metadata/XMLHttpRequest/preserve-ua-header-on-redirect.htm.ini

@@ -0,0 +1,5 @@
+[setrequestheader-header-allowed.htm]
+  type: testharness
+  [XMLHttpRequest: setRequestHeader() - headers that are allowed (User-Agent)]
+    expected: FAIL
+

tests/wpt/metadata/XMLHttpRequest/setrequestheader-header-allowed.htm.ini

@@ -377,3 +377,4 @@
 
   [Window replaceable attribute: devicePixelRatio]
     expected: FAIL
+

tests/wpt/metadata/html/browsers/the-window-object/window-properties.html.ini

@@ -0,0 +1,18 @@
+[Document.currentScript.sub.html]
+  type: testharness
+  expected: TIMEOUT
+  [Script script-window-error]
+    expected: FAIL
+
+  [Script script-svg]
+    expected: NOTRUN
+
+  [Script iframe-src]
+    expected: NOTRUN
+
+  [Script cross-origin]
+    expected: NOTRUN
+
+  [Script document-write]
+    expected: NOTRUN
+

tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.html.ini

@@ -1,8 +1,5 @@
 [document.forms.html]
   type: testharness
-  [document.forms]
-    expected: FAIL
-
   [document.forms iteration]
     expected: FAIL
 

tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini

@@ -0,0 +1,3 @@
+[001-a.html]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.forms.html.ini

@@ -0,0 +1,3 @@
+[001-q.html]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-a.html.ini

@@ -0,0 +1,3 @@
+[001-s.html]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-q.html.ini

@@ -0,0 +1,3 @@
+[001-x.xhtml]
+  type: reftest
+  expected: FAIL

tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-s.html.ini

@@ -1 +1 @@
-a1cd27e6a3b961129fd4710513cc29e4f7c9cc67
+dbf549ea32d23cf96b7f49e3333c068aaf050bc3

tests/wpt/metadata/html/rendering/non-replaced-elements/phrasing-content-0/font-element-text-decoration-color/001-x.xhtml.ini

@@ -22,6 +22,22 @@
         client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_name=user-agent"))
         client.send(null)
       })
+
+      var test2 = async_test()
+      test2.step(function() {
+        var client = new XMLHttpRequest()
+          client.onreadystatechange = function() {
+            test2.step(function() {
+              if(client.readyState == 4) {
+                assert_equals(client.responseText, 'user-agent: TEST\n')
+                test2.done()
+              }
+            })
+          }
+        client.open("POST", "resources/redirect.py?location="+encodeURIComponent("inspect-headers.py?filter_name=user-agent"))
+        client.setRequestHeader("User-Agent", "TEST")
+        client.send(null)
+      })
     </script>
   </body>
 </html>

tests/wpt/metadata/mozilla-sync

@@ -21,6 +21,7 @@
       }
       request("Authorization")
       request("Pragma")
+      request("User-Agent")
       request("Content-Transfer-Encoding")
       request("Content-Type")
       request("Overwrite")

tests/wpt/web-platform-tests/XMLHttpRequest/preserve-ua-header-on-redirect.htm

@@ -4,7 +4,7 @@
     <title>XMLHttpRequest: setRequestHeader() - headers that are forbidden</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[5]" />  
+    <link rel="help" href="https://xhr.spec.whatwg.org/#the-setrequestheader()-method" data-tested-assertations="/following::ol/li[5]" />
 
   </head>
   <body>
@@ -29,7 +29,6 @@
         client.setRequestHeader("Trailer", "TEST")
         client.setRequestHeader("Transfer-Encoding", "TEST")
         client.setRequestHeader("Upgrade", "TEST")
-        client.setRequestHeader("User-Agent", "TEST")
         client.setRequestHeader("Via", "TEST")
         client.setRequestHeader("Proxy-", "TEST")
         client.setRequestHeader("Proxy-Authorization", "TEST")

tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm

@@ -11,7 +11,7 @@
 
     </script>
     <!-- enforcing policy:
-script-src 'self' 'sha256-IFmozo9WnnsMXVl_Ka8XzJ3Nd8yzS2zA2ME0mwtd-Ck=' 'sha256-jSpTmJKcrnHttKdYM_wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn_UmK7v_K77t-fvfxA89QT_K9qPNyE=' 'sha256-K-7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; connect-src 'self';
+script-src 'self' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self';
 -->
     <script>
         alert_assert('PASS (1/4)');

tests/wpt/web-platform-tests/XMLHttpRequest/setrequestheader-header-forbidden.htm

@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: scripthash-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-IFmozo9WnnsMXVl_Ka8XzJ3Nd8yzS2zA2ME0mwtd-Ck=' 'sha256-jSpTmJKcrnHttKdYM_wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn_UmK7v_K77t-fvfxA89QT_K9qPNyE=' 'sha256-K-7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'sha256-IFmozo9WnnsMXVl/Ka8XzJ3Nd8yzS2zA2ME0mwtd+Ck=' 'sha256-jSpTmJKcrnHttKdYM/wCCDJoQY5tdSxNf7zd2prwFfI=' 'sha256-qbgA2XjB2EZKjn/UmK7v/K77t+fvfxA89QT/K9qPNyE=' 'sha256-K+7X5Ip3msvRvyQzf6fkrWZziuhaUIee1aLnlP5nX10='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html

@@ -11,7 +11,7 @@
 
     </script>
     <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' 'sha256-xy4iRAvdlFCq-M5-4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self';
+script-src 'self' 'unsafe-inline' 'sha256-xy4iRAvdlFCq+M5+4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self';
 -->
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <!-- The following two scripts contain two separate code points (U+00C5

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-allowed.sub.html.sub.headers

@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: scripthash-unicode-normalization={{$id:uuid()}}; Path=/content-security-policy/blink-contrib-2
-Content-Security-Policy: script-src 'self' 'sha256-xy4iRAvdlFCq-M5-4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'sha256-xy4iRAvdlFCq+M5+4yu4B7dy0Kc2FfljmZO4Jkj3Yhw='; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html

@@ -9,8 +9,8 @@
     <script src="../support/logTest.sub.js?logs=[]"></script>
     <script src='../support/alertAssert.sub.js?alerts=["Pass 1 of 2","Pass 2 of 2"]'></script>
     <!-- enforcing policy:
-script-src 'self' 'unsafe-inline' http://127.0.0.1:* 'unsafe-inline'; connect-src 'self';
--->
+      script-src 'self' 'unsafe-inline'; connect-src 'self';
+    -->
 </head>
 
 <body>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib-2/scripthash-unicode-normalization.sub.html.sub.headers

@@ -3,4 +3,4 @@ Cache-Control: no-store, no-cache, must-revalidate
 Cache-Control: post-check=0, pre-check=0, false
 Pragma: no-cache
 Set-Cookie: injected-inline-script-allowed={{$id:uuid()}}; Path=/content-security-policy/blink-contrib
-Content-Security-Policy: script-src 'self' 'unsafe-inline' http://127.0.0.1:* 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}
+Content-Security-Policy: script-src 'self' 'unsafe-inline'; connect-src 'self'; report-uri /content-security-policy/support/report.py?op=put&reportID={{$id}}

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html

@@ -14,7 +14,7 @@
 <body>
     <script src="resources/inject-script.js"></script>
     <div id="log"></div>
-    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20http://127.0.0.1:*"></script>
+    <script async defer src="../support/checkReport.sub.js?reportExists=true&amp;reportField=violated-directive&amp;reportValue=script-src%20'self'"></script>
 </body>
 
 </html>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/frame-src-redirect-blocked.sub.html.sub.headers

@@ -1,5 +1,5 @@
 document.write("<script>alert_assert('Pass 1 of 2');</script>");
 
 var s = document.createElement('script');
-s.innerText = "alert_assert('Pass 2 of 2');";
+s.textContent = "alert_assert('Pass 2 of 2');";
 document.body.appendChild(s);

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html

@@ -1,5 +1,5 @@
 document.write("<style>#test1 { display: none; }</style>");
 
 var s = document.createElement('style');
-s.innerText = "#test2 { display: none; }";
+s.textContent = "#test2 { display: none; }";
 document.body.appendChild(s);

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-allowed.sub.html.sub.headers

@@ -21,7 +21,11 @@
   "xhr-test" : [],
   "script-svg" : [],
   "script-async" : [],
-  "script-defer" : []
+  "script-defer" : [],
+  "script-async-false" : [],
+  "iframe-src" : [],
+  "cross-origin" : [null],
+  "document-write" : []
 };
 
 var expected = {};
@@ -189,3 +193,38 @@
 <script id='script-async' async src='data:text/plain,verify("script-async"),finish("script-async")'></script>
 
 <script id='script-defer' defer src='data:text/plain,verify("script-defer"),finish("script-defer")'></script>
+
+<!-- Test async = false dynamic script loading -->
+<script>
+  var s = document.createElement("script");
+  s.id = "script-async-false";
+  s.src = "data:text/plain,verify('script-async-false');"
+  s.onload = function() {
+    finish('script-async-false');
+  }
+  s.async = false;
+  document.body.appendChild(s);
+</script>
+
+<!-- Verify in iframe javascript uri scheme -->
+<iframe src="javascript:parent.verify('iframe-src'),parent.finish('iframe-src')"
+        style="visibility:hidden;display:none">
+</iframe>
+
+<!-- Testing cross origin script -->
+<script>
+var s = document.createElement("script");
+s.id = "cross-origin";
+s.src = "http://{{domains[www1]}}:{{ports[http][1]}}/html/dom/documents/dom-tree-accessors/cross-domain.js"
+s.onload = function() {
+  verify('cross-origin')
+  finish('cross-origin');
+}
+document.body.appendChild(s);
+
+</script>
+
+<!-- Testing document.write -->
+<script>
+document.write('<script id="document-write">verify("document-write"); finish("document-write");</' + 'script>');
+</script>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/injected-inline-script-blocked.sub.html

@@ -0,0 +1 @@
+//test script to check cross-domain script execution as in Document.currentScript.sub.html

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html

@@ -34,10 +34,15 @@
   assert_equals(document.forms.item(1).id, "form2");
   assert_equals(document.forms.namedItem("form1").id, "form1");
   assert_equals(document.forms.namedItem("form2").id, "form2");
-  assert_equals(document.forms.item("form1").id, "form1");
-  assert_equals(document.forms.item("form2").id, "form2");
 }, "document.forms")
 
+test(function() {
+  // The `item` method takes one *numeric* argument. Passing a string to `item`
+  // results in that string getting converted to 0
+  assert_equals(document.forms.item("form1").id, "form1");
+  assert_equals(document.forms.item("form2").id, "form1");
+}, "document.forms.item with string arg")
+
 test(function() {
   assert_equals(document.forms[""], undefined);
   assert_equals(document.forms.namedItem(""), null);

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/report-uri-scheme-relative.sub.html.sub.headers

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test for [[SetPrototypeOf]] with Windows</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+test(function() {
+  assert_throws(new TypeError, function() {
+    Object.setPrototypeOf(window, window);
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to itself via setPrototypeOf");
+
+test(function() {
+  assert_throws(new TypeError, function() {
+    window.__proto__ = window;
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to itself via __proto__");
+
+test(function() {
+  assert_throws(new TypeError, function() {
+    Object.setPrototypeOf(window, Object.create(window));
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to something that has the window on " +
+   "its proto chain via setPrototypeOf");
+
+test(function() {
+  assert_throws(new TypeError, function() {
+    window.__proto__ = Object.create(window);
+  }, "Setting the prototype should throw");
+}, "Setting the prototype of a window to something that has the window on " +
+   "its proto chain via __proto__");
+</script>

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/alert-fail.js

@@ -17,9 +17,9 @@
                 notifications = [],
                 text1 = "This is the body: Room 101",
                 text2 = "This is the body: Room 202"
-            createPassFail("If two notifications appear: First one with the"
-                + " text \"" + text1 + "\", followed by one with the text \""
-                + text2 + "\"",
+            createPassFail("If a notification with the text \""
+                + text2 + "\", replaces the notification with the text \""
+                + text1 + "\" in the same position",
                 t, closeNotifications, notifications)
             notification1 = new Notification("New Email Received", {
                 body: text1,

tests/wpt/web-platform-tests/content-security-policy/blink-contrib/resources/inject-script.js

@@ -1,6 +1,7 @@
 <!doctype html>
 <title>Selection.addRange() tests</title>
 <div id=log></div>
+<meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=common.js></script>