From 15a0547b079fb15b8edcf4ffdbca5fd8afdc595e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 26 Jan 2017 14:50:33 +0100 Subject: [PATCH 1/3] Avoid data URLs for read-media tests. --- .../browsing-the-web/read-media/pageload-image.html.ini | 5 ----- .../browsers/browsing-the-web/read-media/pageload-image.html | 3 +-- .../browsers/browsing-the-web/read-media/pageload-video.html | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini deleted file mode 100644 index a285ed1a1e3..00000000000 --- a/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pageload-image.html] - type: testharness - [The document for a standalone media file should have one child in the body.] - expected: FAIL - diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html index 52151b8deb7..9380b19f699 100644 --- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html +++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html @@ -24,7 +24,6 @@
- + diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html index 13bc5db4a43..8341731429f 100644 --- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html +++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html @@ -24,7 +24,6 @@
- + From c853337d644757c4b09d18dd7c0b2f90ea0de442 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 26 Jan 2017 15:25:49 +0100 Subject: [PATCH 2/3] Check the contentType attribute for media documents. --- .../browsing-the-web/read-media/pageload-image.html.ini | 5 +++++ .../browsers/browsing-the-web/read-media/pageload-image.html | 1 + .../browsers/browsing-the-web/read-media/pageload-video.html | 1 + 3 files changed, 7 insertions(+) create mode 100644 tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini new file mode 100644 index 00000000000..a285ed1a1e3 --- /dev/null +++ b/tests/wpt/metadata/html/browsers/browsing-the-web/read-media/pageload-image.html.ini @@ -0,0 +1,5 @@ +[pageload-image.html] + type: testharness + [The document for a standalone media file should have one child in the body.] + expected: FAIL + diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html index 9380b19f699..1f9c084fd00 100644 --- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html +++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-image.html @@ -13,6 +13,7 @@ function frameLoaded() { var testframe = document.getElementById('testframe'); + assert_equals(testframe.contentDocument.contentType, "image/png"); var testframeChildren = testframe.contentDocument.body.childNodes; assert_equals(testframeChildren.length, 1, "Body of image document has 1 child"); assert_equals(testframeChildren[0].nodeName, "IMG", "Only child of body must be an element"); diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html index 8341731429f..69ef7413b38 100644 --- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html +++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/read-media/pageload-video.html @@ -13,6 +13,7 @@ function frameLoaded() { var testframe = document.getElementById('testframe'); + assert_equals(testframe.contentDocument.contentType, "video/webm"); var testframeChildren = testframe.contentDocument.body.childNodes; assert_equals(testframeChildren.length, 1, "Body of image document has 1 child"); assert_equals(testframeChildren[0].nodeName, "VIDEO", "Only child of body must be an