From ea2bc0023bb239c0bfd5a3343bfee9f6f632cbc3 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Mon, 18 May 2015 00:35:23 +0800
Subject: [PATCH] Made open event in WebScoket not cancelable (fixes #6101)

---
 components/script/dom/websocket.rs                             | 2 +-
 .../websockets/interfaces/WebSocket/events/018.html.ini        | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 009ca43a78b..75c868b50db 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -247,7 +247,7 @@ impl WebSocketTaskHandler {
         let event = Event::new(global.r(),
             "open".to_owned(),
             EventBubbles::DoesNotBubble,
-            EventCancelable::Cancelable).root();
+            EventCancelable::NotCancelable).root();
         let target: JSRef<EventTarget> = EventTargetCast::from_ref(ws);
         event.r().fire(target);
     }
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
index 94e107e3f53..1f833c38a68 100644
--- a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/018.html.ini
@@ -1,9 +1,6 @@
 [018.html]
   type: testharness
   expected: TIMEOUT
-  [open event]
-    expected: FAIL
-
   [message event]
     expected: TIMEOUT