aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-16 06:39:56 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-16 06:39:56 -0600
commita2978f2add3a9c828b7bb701cb2d04318e5c0b45 (patch)
tree85a6dc6f48dc5aa0ffadad244b3cf8865999399f
parent5ab9aa5013801a8ac2b9527a6079c62cc56ff81b (diff)
parent47e76ff4ab5a8167dc051e73825be71e59d116b0 (diff)
downloadservo-a2978f2add3a9c828b7bb701cb2d04318e5c0b45.tar.gz
servo-a2978f2add3a9c828b7bb701cb2d04318e5c0b45.zip
Auto merge of #7236 - nox:dictionary-failure-code, r=Ms2ger
Fix dictionary member conversion failure (fixes #7231) <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7236) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py1
-rw-r--r--tests/wpt/metadata/DOMEvents/constructors.html.ini76
-rw-r--r--tests/wpt/web-platform-tests/DOMEvents/constructors.html6
3 files changed, 81 insertions, 2 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index f1b239a1922..12399ecc2ed 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -4696,7 +4696,6 @@ class CGDictionary(CGThing):
descriptorProvider,
isMember="Dictionary",
defaultValue=member.defaultValue,
- failureCode="return Err(());",
exceptionCode="return Err(());"))
for member in dictionary.members]
diff --git a/tests/wpt/metadata/DOMEvents/constructors.html.ini b/tests/wpt/metadata/DOMEvents/constructors.html.ini
index c184b4a6143..b0a20934357 100644
--- a/tests/wpt/metadata/DOMEvents/constructors.html.ini
+++ b/tests/wpt/metadata/DOMEvents/constructors.html.ini
@@ -1,3 +1,77 @@
[constructors.html]
type: testharness
- disabled: issue 5340
+ [FocusEvent constructor (no argument)]
+ expected: FAIL
+
+ [FocusEvent constructor (undefined argument)]
+ expected: FAIL
+
+ [FocusEvent constructor (null argument)]
+ expected: FAIL
+
+ [FocusEvent constructor (empty argument)]
+ expected: FAIL
+
+ [FocusEvent constructor (argument with default values)]
+ expected: FAIL
+
+ [FocusEvent constructor (argument with non-default values)]
+ expected: FAIL
+
+ [MouseEvent constructor (no argument)]
+ expected: FAIL
+
+ [MouseEvent constructor (undefined argument)]
+ expected: FAIL
+
+ [MouseEvent constructor (null argument)]
+ expected: FAIL
+
+ [MouseEvent constructor (empty argument)]
+ expected: FAIL
+
+ [MouseEvent constructor (argument with default values)]
+ expected: FAIL
+
+ [MouseEvent constructor (argument with non-default values)]
+ expected: FAIL
+
+ [WheelEvent constructor (no argument)]
+ expected: FAIL
+
+ [WheelEvent constructor (undefined argument)]
+ expected: FAIL
+
+ [WheelEvent constructor (null argument)]
+ expected: FAIL
+
+ [WheelEvent constructor (empty argument)]
+ expected: FAIL
+
+ [WheelEvent constructor (argument with default values)]
+ expected: FAIL
+
+ [WheelEvent constructor (argument with non-default values)]
+ expected: FAIL
+
+ [KeyboardEvent constructor (argument with non-default values)]
+ expected: FAIL
+
+ [CompositionEvent constructor (no argument)]
+ expected: FAIL
+
+ [CompositionEvent constructor (undefined argument)]
+ expected: FAIL
+
+ [CompositionEvent constructor (null argument)]
+ expected: FAIL
+
+ [CompositionEvent constructor (empty argument)]
+ expected: FAIL
+
+ [CompositionEvent constructor (argument with default values)]
+ expected: FAIL
+
+ [CompositionEvent constructor (argument with non-default values)]
+ expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/DOMEvents/constructors.html b/tests/wpt/web-platform-tests/DOMEvents/constructors.html
index b41d1d7bd0c..1741b960025 100644
--- a/tests/wpt/web-platform-tests/DOMEvents/constructors.html
+++ b/tests/wpt/web-platform-tests/DOMEvents/constructors.html
@@ -144,4 +144,10 @@ Object.keys(expected).forEach(function(iface) {
assert_props(iface, event, false);
}, iface + " constructor (argument with non-default values)");
});
+
+test(function () {
+ assert_throws(new TypeError(), function() {
+ new UIEvent("x", { view: 7 })
+ });
+}, "UIEvent constructor (view argument with wrong type)")
</script>