From 6d0e103cdefd8a7b08e7f7f87731493db7b4703c Mon Sep 17 00:00:00 2001 From: Bryan Bell Date: Fri, 29 Aug 2014 17:35:30 -0700 Subject: [PATCH] Update and expand iframe tests Add iframe tests to their own subdirectory and add another test case that used to trigger a fatal error. The new test case uses the "allow-scripts" sandbox attribute to work around a script task failure caused by the child frame sharing the same script task as the parent. --- tests/ref/basic.list | 4 +++- tests/ref/iframe/multiple_external.html | 17 +++++++++++++++++ tests/ref/iframe/multiple_external_child.html | 5 +++++ tests/ref/iframe/multiple_external_ref.html | 5 +++++ tests/ref/iframe/simple.html | 9 +++++++++ .../simple_ref.html} | 0 tests/ref/simple_iframe.html | 7 ------- 7 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 tests/ref/iframe/multiple_external.html create mode 100644 tests/ref/iframe/multiple_external_child.html create mode 100644 tests/ref/iframe/multiple_external_ref.html create mode 100644 tests/ref/iframe/simple.html rename tests/ref/{simple_iframe_ref.html => iframe/simple_ref.html} (100%) delete mode 100644 tests/ref/simple_iframe.html diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 40df098bd79..cfb9e4d8f8a 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -36,7 +36,6 @@ == background_external_stylesheet.html background_ref.html == block_image.html 500x300_green.html != block_image.html noteq_500x300_white.html -# == simple_iframe.html simple_iframe_ref.html -- disabled due to iframe crashiness == object_element_a.html object_element_b.html == append_style_a.html append_style_b.html == height_compute_reset.html height_compute.html @@ -116,3 +115,6 @@ flaky_gpu,flaky_linux == acid2_noscroll.html acid2_ref_broken.html # The following tests fails the ref-tests #== multiple_css_class_a.html multiple_css_class_b.html + +== iframe/simple.html iframe/simple_ref.html +== iframe/multiple_external.html iframe/multiple_external_ref.html diff --git a/tests/ref/iframe/multiple_external.html b/tests/ref/iframe/multiple_external.html new file mode 100644 index 00000000000..870bef5ba2d --- /dev/null +++ b/tests/ref/iframe/multiple_external.html @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/tests/ref/iframe/multiple_external_child.html b/tests/ref/iframe/multiple_external_child.html new file mode 100644 index 00000000000..8e1b304226d --- /dev/null +++ b/tests/ref/iframe/multiple_external_child.html @@ -0,0 +1,5 @@ + + + + + diff --git a/tests/ref/iframe/multiple_external_ref.html b/tests/ref/iframe/multiple_external_ref.html new file mode 100644 index 00000000000..8e1b304226d --- /dev/null +++ b/tests/ref/iframe/multiple_external_ref.html @@ -0,0 +1,5 @@ + + + + + diff --git a/tests/ref/iframe/simple.html b/tests/ref/iframe/simple.html new file mode 100644 index 00000000000..3625f863b0b --- /dev/null +++ b/tests/ref/iframe/simple.html @@ -0,0 +1,9 @@ + + +
+ +
+ + diff --git a/tests/ref/simple_iframe_ref.html b/tests/ref/iframe/simple_ref.html similarity index 100% rename from tests/ref/simple_iframe_ref.html rename to tests/ref/iframe/simple_ref.html diff --git a/tests/ref/simple_iframe.html b/tests/ref/simple_iframe.html deleted file mode 100644 index 08c7de8847f..00000000000 --- a/tests/ref/simple_iframe.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - -