auto merge of #4265 : ProgramFOX/servo/issue-4251, r=Ms2ger

Resolves #4251
This commit is contained in:
bors-servo 2014-12-06 07:31:01 -07:00
commit b805e74fef
5 changed files with 7 additions and 16 deletions

View file

@ -6,13 +6,13 @@
<script>
// test1: characterSet
{
is(document.characterSet, "utf-8", "test1-0, characterSet");
is(document.characterSet, "UTF-8", "test1-0, characterSet");
var xmldoc = new Document;
is(xmldoc.characterSet, "utf-8", "test2-1, characterSet");
is(xmldoc.characterSet, "UTF-8", "test2-1, characterSet");
var htmldoc = document.implementation.createHTMLDocument("title");
is(htmldoc.characterSet, "utf-8", "test2-2, characterSet");
is(htmldoc.characterSet, "UTF-8", "test2-2, characterSet");
}
</script>
</head>

View file

@ -6,7 +6,7 @@
// test1: default characterSet
{
// FIXME: https://github.com/mozilla-servo/libhubbub/issues/5
is(document.characterSet, "utf-8", "test1-0, default characterSet");
is(document.characterSet, "UTF-8", "test1-0, default characterSet");
}
</script>
</head>

View file

@ -6,7 +6,7 @@
<script>
// test1: unknown charset
{
is(document.characterSet, "utf-8", "test1-0, unknown charset");
is(document.characterSet, "UTF-8", "test1-0, unknown charset");
}
</script>
</head>

View file

@ -219,21 +219,12 @@
[paras[4\].firstElementChild]
expected: FAIL
[document.characterSet]
expected: FAIL
[document.inputEncoding]
expected: FAIL
[foreignDoc.characterSet]
expected: FAIL
[foreignDoc.inputEncoding]
expected: FAIL
[xmlDoc.characterSet]
expected: FAIL
[xmlDoc.inputEncoding]
expected: FAIL