Auto merge of #8370 - Ms2ger:update-js, r=jdm

Update js.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8370)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-07 08:11:19 +05:30
commit 8c0f0a22d2
5 changed files with 19 additions and 17 deletions

View file

@ -1,6 +1,6 @@
[overridemimetype-open-state-force-utf-8.htm]
type: testharness
expected: CRASH
expected: TIMEOUT
[XMLHttpRequest: overrideMimeType() in open state, enforcing UTF-8 encoding]
expected: FAIL
expected: TIMEOUT

View file

@ -1,6 +1,6 @@
[overridemimetype-unsent-state-force-shiftjis.htm]
type: testharness
expected: CRASH
expected: TIMEOUT
[XMLHttpRequest: overrideMimeType() in unsent state, enforcing Shift-JIS encoding]
expected: FAIL
expected: TIMEOUT