aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-09-24 03:55:29 -0600
committerbors-servo <metajack+bors@gmail.com>2015-09-24 03:55:29 -0600
commit2623f58a4b2b302c354257632e3ff67d1dfa72d9 (patch)
treeee7f90cb3dd0306336b030b4a7fd693c60e79501 /tests
parentb4b3cedc10cec47d95880bfbe55f2dbc37cd910e (diff)
parent982e55ac1c157aa0484a34d8cb33c12b7bb7eef3 (diff)
downloadservo-2623f58a4b2b302c354257632e3ff67d1dfa72d9.tar.gz
servo-2623f58a4b2b302c354257632e3ff67d1dfa72d9.zip
Auto merge of #7719 - Manishearth:ghfix, r=Ms2ger
Various fixes to make github less error-prone r? @Ms2ger <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7719) <!-- Reviewable:end -->
Diffstat (limited to 'tests')
-rw-r--r--tests/wpt/metadata/html/dom/interfaces.html.ini12
-rw-r--r--tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini6
-rw-r--r--tests/wpt/mozilla/meta/MANIFEST.json6
-rw-r--r--tests/wpt/mozilla/tests/mozilla/preserve_wrapper_callback.html22
4 files changed, 28 insertions, 18 deletions
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 29648c39c4b..f4b6a1162fc 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -5079,9 +5079,6 @@
[HTMLInputElement interface: attribute dirName]
expected: FAIL
- [HTMLInputElement interface: attribute form]
- expected: FAIL
-
[HTMLInputElement interface: attribute files]
expected: FAIL
@@ -5208,9 +5205,6 @@
[HTMLInputElement interface: document.createElement("input") must inherit property "dirName" with the proper type (6)]
expected: FAIL
- [HTMLInputElement interface: document.createElement("input") must inherit property "form" with the proper type (8)]
- expected: FAIL
-
[HTMLInputElement interface: document.createElement("input") must inherit property "files" with the proper type (9)]
expected: FAIL
@@ -5346,9 +5340,6 @@
[HTMLButtonElement interface: attribute autofocus]
expected: FAIL
- [HTMLButtonElement interface: attribute form]
- expected: FAIL
-
[HTMLButtonElement interface: attribute formNoValidate]
expected: FAIL
@@ -5376,9 +5367,6 @@
[HTMLButtonElement interface: document.createElement("button") must inherit property "autofocus" with the proper type (0)]
expected: FAIL
- [HTMLButtonElement interface: document.createElement("button") must inherit property "form" with the proper type (2)]
- expected: FAIL
-
[HTMLButtonElement interface: document.createElement("button") must inherit property "formNoValidate" with the proper type (6)]
expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini b/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini
index 4ba65533c66..3a4b9321f4c 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-control-infrastructure/form.html.ini
@@ -1,14 +1,8 @@
[form.html]
type: testharness
- [button.form]
- expected: FAIL
-
[fieldset.form]
expected: FAIL
- [input.form]
- expected: FAIL
-
[keygen.form]
expected: FAIL
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 3cd5550686c..1449da68159 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -749,6 +749,12 @@
"url": "/_mozilla/mozilla/parentnodes.html"
}
],
+ "mozilla/preserve_wrapper_callback.html": [
+ {
+ "path": "mozilla/preserve_wrapper_callback.html",
+ "url": "/_mozilla/mozilla/preserve_wrapper_callback.html"
+ }
+ ],
"mozilla/proxy_setter.html": [
{
"path": "mozilla/proxy_setter.html",
diff --git a/tests/wpt/mozilla/tests/mozilla/preserve_wrapper_callback.html b/tests/wpt/mozilla/tests/mozilla/preserve_wrapper_callback.html
new file mode 100644
index 00000000000..13369b98ede
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/preserve_wrapper_callback.html
@@ -0,0 +1,22 @@
+<html>
+ <head>
+ <script src="/resources/testharness.js"></script>
+ <script src="/resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <input id="a">
+ <script>
+ test(function() {
+ x = new WeakMap();
+ x.set(document.getElementById("a"), 2);
+ assert_equals(x.get(document.getElementById("a")), 2);
+ }, "WeakMaps with DOM objects");
+ test(function() {
+ x = new WeakMap();
+ y = {};
+ x.set(y, 2);
+ assert_equals(x.get(y), 2);
+ }, "WeakMaps with objects");
+ </script>
+ </body>
+</html>