From 5f02b63f5994e8a0632fde1edd0b1690d457c6cd Mon Sep 17 00:00:00 2001 From: Edward Cho Date: Wed, 1 Apr 2015 16:18:01 -0500 Subject: [PATCH 1/2] fixes #5468 --- .../Document-contentType/contentType/contenttype_bmp.html.ini | 3 ++- .../Document-contentType/contentType/contenttype_css.html.ini | 3 ++- .../contentType/contenttype_datauri_01.html.ini | 4 +++- .../contentType/contenttype_datauri_02.html.ini | 4 +++- .../Document-contentType/contentType/contenttype_gif.html.ini | 3 ++- .../contentType/contenttype_html.html.ini | 1 - .../contentType/contenttype_javascripturi.html.ini | 4 +++- .../Document-contentType/contentType/contenttype_jpg.html.ini | 3 ++- .../contentType/contenttype_mimeheader_01.html.ini | 3 ++- .../contentType/contenttype_mimeheader_02.html.ini | 1 - .../Document-contentType/contentType/contenttype_png.html.ini | 3 ++- .../Document-contentType/contentType/contenttype_txt.html.ini | 1 - .../Document-contentType/contentType/contenttype_xml.html.ini | 3 ++- 13 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini index 484ddb01f00..935d94eddad 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_bmp.html.ini @@ -1,3 +1,4 @@ [contenttype_bmp.html] type: testharness - disabled: iframe load event + [BMP document.contentType === 'image/bmp'] + expected: FAIL diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini index 83f8ea74494..94abb3cebf5 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_css.html.ini @@ -1,3 +1,4 @@ [contenttype_css.html] type: testharness - disabled: iframe load event + [CSS document.contentType === 'text/css'] + expected: FAIL diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html.ini index a48a33f893c..63fa14fcd72 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_01.html.ini @@ -1,3 +1,5 @@ [contenttype_datauri_01.html] type: testharness - disabled: iframe load event + expected: TIMEOUT + [Data URI document.contentType === 'text/plain' when data URI MIME type is not set] + expected: TIMEOUT diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html.ini index b3fe3fd555f..6d0366a434b 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_datauri_02.html.ini @@ -1,3 +1,5 @@ [contenttype_datauri_02.html] type: testharness - disabled: iframe load event + expected: TIMEOUT + [Data URI document.contentType === 'text/html' when data URI MIME type is set] + expected: TIMEOUT diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini index 34c913f4901..a1fedef8cbe 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_gif.html.ini @@ -1,3 +1,4 @@ [contenttype_gif.html] type: testharness - disabled: iframe load event + [GIF document.contentType === 'image/gif'] + expected: FAIL diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini index 24708e001fb..4362def93d2 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini @@ -1,3 +1,2 @@ [contenttype_html.html] type: testharness - disabled: iframe load event diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html.ini index d6bbf6a9dbc..83ebb4824dd 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_javascripturi.html.ini @@ -1,3 +1,5 @@ [contenttype_javascripturi.html] type: testharness - disabled: iframe load event + expected: TIMEOUT + [Javascript URI document.contentType === 'text/html'] + expected: TIMEOUT diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini index 4e531f45865..a1011e7909b 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_jpg.html.ini @@ -1,3 +1,4 @@ [contenttype_jpg.html] type: testharness - disabled: iframe load event + [JPG document.contentType === 'image/jpeg'] + expected: FAIL diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html.ini index ea931b60e62..a47f12e3660 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_01.html.ini @@ -1,3 +1,4 @@ [contenttype_mimeheader_01.html] type: testharness - disabled: iframe load event + [Custom document.contentType === 'text/xml' when explicitly set to this value] + expected: FAIL diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini index 92790d3a600..06dfbe2f92c 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini @@ -1,3 +1,2 @@ [contenttype_mimeheader_02.html] type: testharness - disabled: iframe load event diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini index 2f7fc9e5d41..d26f8ea048b 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_png.html.ini @@ -1,3 +1,4 @@ [contenttype_png.html] type: testharness - disabled: iframe load event + [PNG document.contentType === 'image/png'] + expected: FAIL diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini index 42f7deef964..df482e0b505 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini @@ -1,3 +1,2 @@ [contenttype_txt.html] type: testharness - disabled: iframe load event diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini index 99f140b47b2..aeeec3216e0 100644 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini +++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini @@ -1,3 +1,4 @@ [contenttype_xml.html] type: testharness - disabled: iframe load event + [XML document.contentType === 'application/xml'] + expected: FAIL From d00bb057ba33f11c3f08ab0110bed6a07c74c3f4 Mon Sep 17 00:00:00 2001 From: Edward Cho Date: Wed, 1 Apr 2015 17:35:50 -0500 Subject: [PATCH 2/2] remove passing contentType wpt tests --- .../Document-contentType/contentType/contenttype_html.html.ini | 2 -- .../contentType/contenttype_mimeheader_02.html.ini | 2 -- .../Document-contentType/contentType/contenttype_txt.html.ini | 2 -- 3 files changed, 6 deletions(-) delete mode 100644 tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini delete mode 100644 tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini delete mode 100644 tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini deleted file mode 100644 index 4362def93d2..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contenttype_html.html] - type: testharness diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini deleted file mode 100644 index 06dfbe2f92c..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_mimeheader_02.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contenttype_mimeheader_02.html] - type: testharness diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini deleted file mode 100644 index df482e0b505..00000000000 --- a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini +++ /dev/null @@ -1,2 +0,0 @@ -[contenttype_txt.html] - type: testharness