From accf279d0863c1f8ffb282561ca911a27874aaca Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 4 Apr 2017 23:26:25 +0200 Subject: [PATCH 1/3] Remove "interact" flags for tests that can be run automatically There were a bunch of tests that have both a reference file and the "interact" flag. They use some small JavaScript to execute some steps before checking the output against reference file. This caused them to be wrongly considered manual tests when they can be run automatically. For more info check w3c/wpt-tools#196 and w3c/wpt-tools#197. --- css/CSS2/backgrounds/background-root-012.xht | 2 +- css/CSS2/backgrounds/background-root-013.xht | 2 +- css/CSS2/backgrounds/background-root-014.xht | 2 +- css/CSS2/backgrounds/background-root-017.xht | 1 - css/css-regions-1/contentEditable/contentEditable-001.html | 2 +- css/css-regions-1/contentEditable/contentEditable-002.html | 2 +- css/css-regions-1/contentEditable/contentEditable-003.html | 2 +- css/css-regions-1/contentEditable/contentEditable-004.html | 2 +- css/css-regions-1/contentEditable/contentEditable-005.html | 2 +- css/css-regions-1/contentEditable/contentEditable-006.html | 2 +- css/css-regions-1/contentEditable/contentEditable-007.html | 2 +- css/css-regions-1/contentEditable/contentEditable-008.html | 2 +- css/css-regions-1/contentEditable/contentEditable-009.html | 2 +- css/css-regions-1/contentEditable/contentEditable-010.html | 2 +- css/css-regions-1/contentEditable/contentEditable-011.html | 2 +- css/css-writing-modes-3/background-position-vrl-018.xht | 4 ++-- css/css-writing-modes-3/background-position-vrl-020.xht | 4 ++-- css/css-writing-modes-3/background-position-vrl-022.xht | 4 ++-- css/selectors4/focus-within-001.html | 1 - css/selectors4/focus-within-002.html | 1 - css/selectors4/focus-within-003.html | 1 - css/selectors4/focus-within-004.html | 1 - css/selectors4/focus-within-005.html | 1 - css/selectors4/focus-within-006.html | 1 - css/selectors4/focus-within-shadow-001.html | 2 +- css/selectors4/focus-within-shadow-002.html | 2 +- css/selectors4/focus-within-shadow-003.html | 2 +- css/selectors4/focus-within-shadow-004.html | 2 +- css/selectors4/focus-within-shadow-005.html | 2 +- .../mozilla-central-reftests/selectors4/focus-within-1.html | 1 - .../mozilla-central-reftests/selectors4/focus-within-2.html | 1 - .../mozilla-central-reftests/selectors4/focus-within-3.html | 1 - 32 files changed, 25 insertions(+), 35 deletions(-) diff --git a/css/CSS2/backgrounds/background-root-012.xht b/css/CSS2/backgrounds/background-root-012.xht index 7ed9b31b9d8e7b..7a5d73b44c0bb4 100644 --- a/css/CSS2/backgrounds/background-root-012.xht +++ b/css/CSS2/backgrounds/background-root-012.xht @@ -7,7 +7,7 @@ - + + + + + + +
In the middle of the bright blue rectangle, there should be a purple tile.
+ + + diff --git a/css/CSS2/backgrounds/background-root-012b.xht b/css/CSS2/backgrounds/background-root-012b.xht new file mode 100644 index 00000000000000..fddec0cfd00043 --- /dev/null +++ b/css/CSS2/backgrounds/background-root-012b.xht @@ -0,0 +1,24 @@ + + + +CSS Test: Background propagation on <body> and <html> - propagated position + + + + + + + + + + +

In the middle of the bright blue rectangle, there +should be a purple tile. + +

+ diff --git a/css/CSS2/backgrounds/background-root-013-ref.xht b/css/CSS2/backgrounds/background-root-013a-ref.xht similarity index 100% rename from css/CSS2/backgrounds/background-root-013-ref.xht rename to css/CSS2/backgrounds/background-root-013a-ref.xht diff --git a/css/CSS2/backgrounds/background-root-013.xht b/css/CSS2/backgrounds/background-root-013a.xht similarity index 91% rename from css/CSS2/backgrounds/background-root-013.xht rename to css/CSS2/backgrounds/background-root-013a.xht index 0aa0ed8d7acac2..0a01d1687afd4c 100644 --- a/css/CSS2/backgrounds/background-root-013.xht +++ b/css/CSS2/backgrounds/background-root-013a.xht @@ -5,8 +5,8 @@ - - + + + + + + + +
+
In the middle of this green box with the bright green border, there should be a purple tile.
+
+ + + diff --git a/css/CSS2/backgrounds/background-root-013b.xht b/css/CSS2/backgrounds/background-root-013b.xht new file mode 100644 index 00000000000000..76268ed3db959f --- /dev/null +++ b/css/CSS2/backgrounds/background-root-013b.xht @@ -0,0 +1,26 @@ + + + +CSS Test: Background propagation on <body> and <html> - non-propagated position + + + + + + + + + + +

In the middle of this green box with the bright green border, there +should be a purple tile.

+ + + + diff --git a/css/CSS2/backgrounds/background-root-014-ref.xht b/css/CSS2/backgrounds/background-root-014a-ref.xht similarity index 100% rename from css/CSS2/backgrounds/background-root-014-ref.xht rename to css/CSS2/backgrounds/background-root-014a-ref.xht diff --git a/css/CSS2/backgrounds/background-root-014.xht b/css/CSS2/backgrounds/background-root-014a.xht similarity index 92% rename from css/CSS2/backgrounds/background-root-014.xht rename to css/CSS2/backgrounds/background-root-014a.xht index 9cbc20dec85f3c..fd2364dbf11c2e 100644 --- a/css/CSS2/backgrounds/background-root-014.xht +++ b/css/CSS2/backgrounds/background-root-014a.xht @@ -5,8 +5,8 @@ - - + + + + + + + +
In the exact middle of this page, there should be a purple tile. The tile must only be visible when the green box overlaps the tile; it must be hidden when overlapping the blue background.
+ + + diff --git a/css/CSS2/backgrounds/background-root-014b.xht b/css/CSS2/backgrounds/background-root-014b.xht new file mode 100644 index 00000000000000..6866fb2c97c8f5 --- /dev/null +++ b/css/CSS2/backgrounds/background-root-014b.xht @@ -0,0 +1,24 @@ + + + +CSS Test: Background propagation on <body> and <html> - non-propagated attached position + + + + + + + + + +

In the exact middle of this page, there should be a purple tile. +The tile must only be visible when the green box overlaps the tile; +it must be hidden when overlapping the blue background.

+ + + diff --git a/css/css-regions-1/contentEditable/contentEditable-001.html b/css/css-regions-1/contentEditable/contentEditable-001.html index 3b695eb5d24ec8..204d23eee2afc3 100644 --- a/css/css-regions-1/contentEditable/contentEditable-001.html +++ b/css/css-regions-1/contentEditable/contentEditable-001.html @@ -1,5 +1,5 @@ - + CSS Regions: named flow content has contentEditable attribute set @@ -53,6 +53,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-002.html b/css/css-regions-1/contentEditable/contentEditable-002.html index 140d65c0277554..f455178fcba7aa 100644 --- a/css/css-regions-1/contentEditable/contentEditable-002.html +++ b/css/css-regions-1/contentEditable/contentEditable-002.html @@ -1,5 +1,5 @@ - + CSS Regions: named flow content has a child with contentEditable attribute set @@ -68,6 +68,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-003.html b/css/css-regions-1/contentEditable/contentEditable-003.html index f6704be50443ce..746316c6bc45ed 100644 --- a/css/css-regions-1/contentEditable/contentEditable-003.html +++ b/css/css-regions-1/contentEditable/contentEditable-003.html @@ -1,5 +1,5 @@ - + CSS Regions: named flow content is child of an element that has contentEditable attribute set @@ -81,6 +81,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-004.html b/css/css-regions-1/contentEditable/contentEditable-004.html index 63042310901f81..d6c34b99d69f79 100644 --- a/css/css-regions-1/contentEditable/contentEditable-004.html +++ b/css/css-regions-1/contentEditable/contentEditable-004.html @@ -1,5 +1,5 @@ - + CSS Regions: element has contentEditable attribute set and both it and a child of it are @@ -75,6 +75,7 @@ <script type="text/javascript"> insertText("#marked-parent", "foobar bazquux"); insertText("#marked-child", "foobar bazquux"); + document.documentElement.classList.remove('reftest-wait'); </script> </body> </html> diff --git a/css/css-regions-1/contentEditable/contentEditable-005.html b/css/css-regions-1/contentEditable/contentEditable-005.html index 7987fa5cdf0eb0..d13b42cbf2b730 100644 --- a/css/css-regions-1/contentEditable/contentEditable-005.html +++ b/css/css-regions-1/contentEditable/contentEditable-005.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html class="reftest-wait"> <head> <meta charset="utf-8"> <title>CSS Regions: named flow content has contentEditable attribute set and is fragmented @@ -73,6 +73,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-006.html b/css/css-regions-1/contentEditable/contentEditable-006.html index a6f8a50e4e1128..2a7b4170095a4f 100644 --- a/css/css-regions-1/contentEditable/contentEditable-006.html +++ b/css/css-regions-1/contentEditable/contentEditable-006.html @@ -1,5 +1,5 @@ - + CSS Regions: named flow content has contentEditable attribute set and is flowed in an @@ -73,6 +73,7 @@ <script type="text/javascript"> insertText("#marked-one", "foobar bazquux"); insertText("#marked-two", "foobar bazquux"); + document.documentElement.classList.remove('reftest-wait'); </script> </body> </html> diff --git a/css/css-regions-1/contentEditable/contentEditable-007.html b/css/css-regions-1/contentEditable/contentEditable-007.html index aca6e05e25341b..c80957f6ed914e 100644 --- a/css/css-regions-1/contentEditable/contentEditable-007.html +++ b/css/css-regions-1/contentEditable/contentEditable-007.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html class="reftest-wait"> <head> <meta charset="utf-8"> <title>CSS Regions: named flow content has contentEditable attribute set and children of it get @@ -82,6 +82,7 @@ insertText("#marked-outside", "foobar bazquux"); insertText("#marked-inside", "foobar bazquux"); insertText("#marked-inside-new", "foobar bazquux"); + document.documentElement.classList.remove('reftest-wait'); }) </script> </body> diff --git a/css/css-regions-1/contentEditable/contentEditable-008.html b/css/css-regions-1/contentEditable/contentEditable-008.html index 1ed1882de503a0..9aad4956d40dbe 100644 --- a/css/css-regions-1/contentEditable/contentEditable-008.html +++ b/css/css-regions-1/contentEditable/contentEditable-008.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html class="reftest-wait"> <head> <meta charset="utf-8"> <title>CSS Regions: region element has contentEditable attribute set @@ -61,6 +61,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-009.html b/css/css-regions-1/contentEditable/contentEditable-009.html index a67342b4352b27..e709d2e7e9e6c2 100644 --- a/css/css-regions-1/contentEditable/contentEditable-009.html +++ b/css/css-regions-1/contentEditable/contentEditable-009.html @@ -1,5 +1,5 @@ - + CSS Regions: region element has child with contentEditable attribute set @@ -62,6 +62,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-010.html b/css/css-regions-1/contentEditable/contentEditable-010.html index d0944f593e56c4..2e3bc624f9da7f 100644 --- a/css/css-regions-1/contentEditable/contentEditable-010.html +++ b/css/css-regions-1/contentEditable/contentEditable-010.html @@ -1,5 +1,5 @@ - + CSS Regions: auto-size region with contentEditable attribute set @@ -60,6 +60,7 @@ diff --git a/css/css-regions-1/contentEditable/contentEditable-011.html b/css/css-regions-1/contentEditable/contentEditable-011.html index 88daf2a731a690..087287eddd6ae5 100644 --- a/css/css-regions-1/contentEditable/contentEditable-011.html +++ b/css/css-regions-1/contentEditable/contentEditable-011.html @@ -1,5 +1,5 @@ - + CSS Regions: both named flow content and region element have contentEditable attribute set @@ -62,6 +62,7 @@ diff --git a/css/selectors4/focus-within-001.html b/css/selectors4/focus-within-001.html index 95f5562946c495..fcf8a379c87c36 100644 --- a/css/selectors4/focus-within-001.html +++ b/css/selectors4/focus-within-001.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within @@ -28,12 +28,10 @@

Test passes if, when the element below is focused, it is surrounded by a thick green border. There must be no red or blue once it is focused.

-
Focus this element
+
Focus this element
diff --git a/css/selectors4/focus-within-002.html b/css/selectors4/focus-within-002.html index 18aacd41df71c7..e483833febc101 100644 --- a/css/selectors4/focus-within-002.html +++ b/css/selectors4/focus-within-002.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within @@ -27,13 +27,11 @@ it is surrounded by a thick green border. There must be no red or blue once it is focused.

-
Focus this element
+
Focus this element
diff --git a/css/selectors4/focus-within-003.html b/css/selectors4/focus-within-003.html index 2155c5358fe152..b399c4f0cf3eba 100644 --- a/css/selectors4/focus-within-003.html +++ b/css/selectors4/focus-within-003.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within @@ -30,16 +30,14 @@
-
Focus this element
+
Focus this element
diff --git a/css/selectors4/focus-within-004.html b/css/selectors4/focus-within-004.html index 6cb66eb05175dc..169af9e0706aa9 100644 --- a/css/selectors4/focus-within-004.html +++ b/css/selectors4/focus-within-004.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within @@ -37,14 +37,12 @@ There must be no red or blue once it is focused.

-
Focus this element
+
Focus this element
diff --git a/css/selectors4/focus-within-005.html b/css/selectors4/focus-within-005.html index 467ab84ef28ac5..03f927d1b40cf3 100644 --- a/css/selectors4/focus-within-005.html +++ b/css/selectors4/focus-within-005.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within @@ -38,14 +38,12 @@ There must be no red or blue once it is focused.

- Focus this element + Focus this element
diff --git a/css/selectors4/focus-within-006.html b/css/selectors4/focus-within-006.html index 268bc13f32d59b..4a515d7ac485bb 100644 --- a/css/selectors4/focus-within-006.html +++ b/css/selectors4/focus-within-006.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within @@ -39,15 +39,13 @@
- +
diff --git a/css/selectors4/focus-within-shadow-001.html b/css/selectors4/focus-within-shadow-001.html index 8ef7a28fe364df..df94e36b343cfe 100644 --- a/css/selectors4/focus-within-shadow-001.html +++ b/css/selectors4/focus-within-shadow-001.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within with shadow DOM @@ -23,7 +23,7 @@ border: solid 15px green; } -
+
diff --git a/css/selectors4/focus-within-shadow-002.html b/css/selectors4/focus-within-shadow-002.html index 29ae85334d1439..fcea010ba23bb1 100644 --- a/css/selectors4/focus-within-shadow-002.html +++ b/css/selectors4/focus-within-shadow-002.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within with shadow DOM @@ -24,7 +24,7 @@ outline: none; } -
+
diff --git a/css/selectors4/focus-within-shadow-003.html b/css/selectors4/focus-within-shadow-003.html index 345c97f8b10b67..330d1a197cc431 100644 --- a/css/selectors4/focus-within-shadow-003.html +++ b/css/selectors4/focus-within-shadow-003.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within with shadow DOM @@ -26,7 +26,7 @@ outline: none; } -
+
diff --git a/css/selectors4/focus-within-shadow-004.html b/css/selectors4/focus-within-shadow-004.html index 9cce8c78288b64..49cf14832a118a 100644 --- a/css/selectors4/focus-within-shadow-004.html +++ b/css/selectors4/focus-within-shadow-004.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within with shadow DOM @@ -32,7 +32,7 @@ outline: none; } -
+
diff --git a/css/selectors4/focus-within-shadow-005.html b/css/selectors4/focus-within-shadow-005.html index f59ade853fb913..500cdd3811cb83 100644 --- a/css/selectors4/focus-within-shadow-005.html +++ b/css/selectors4/focus-within-shadow-005.html @@ -1,5 +1,5 @@ - + Selectors Level 4: focus-within with shadow DOM @@ -35,7 +35,7 @@ outline: none; } -
+
diff --git a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html index d1b8c017e3de58..f8cd644ce0c873 100644 --- a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html +++ b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html @@ -1,5 +1,5 @@ - + CSS Test: :focus-within selector @@ -32,6 +32,7 @@ var child2 = document.getElementById('child2'); child2.focus(); document.body.offsetWidth; + document.documentElement.classList.remove('reftest-wait'); diff --git a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-2.html b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-2.html index 356e0c36d35617..f462fe43d3a737 100644 --- a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-2.html +++ b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-2.html @@ -1,5 +1,5 @@ - + CSS Test: :focus-within selector @@ -30,6 +30,7 @@ var parent = document.getElementById("parent"); parent.removeChild(child); document.body.offsetWidth; + document.documentElement.classList.remove('reftest-wait'); diff --git a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-3.html b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-3.html index ce032c2b770c17..3b0946645b6b83 100644 --- a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-3.html +++ b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-3.html @@ -1,5 +1,5 @@ - + CSS Test: :focus-within selector @@ -20,7 +20,14 @@

Test passes if, when the element inside the iframe is focused, there is no red border surrounded.

- +
+ From 8f7d27789339230692feca65bc8cbca59975beb5 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 5 Apr 2017 17:24:15 +0200 Subject: [PATCH 3/3] Do not modify tests under css/vendor-imports/ --- .../selectors4/focus-within-1.html | 4 ++-- .../selectors4/focus-within-2.html | 4 ++-- .../selectors4/focus-within-3.html | 12 +++--------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html index f8cd644ce0c873..5a749c3ad04963 100644 --- a/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html +++ b/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/focus-within-1.html @@ -1,5 +1,5 @@ - + CSS Test: :focus-within selector @@ -8,6 +8,7 @@ +