Auto merge of #6102 - KiChjang:websocket-open-event-noncancelable, r=Ms2ger

Fixes #6101

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6102)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-17 12:57:58 -05:00
commit d6c3ddd8fd
2 changed files with 1 additions and 4 deletions

View file

@ -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);
}

View file

@ -1,9 +1,6 @@
[018.html]
type: testharness
expected: TIMEOUT
[open event]
expected: FAIL
[message event]
expected: TIMEOUT