diff options
Diffstat (limited to 'tests/wpt/css-tests/css-grid-1_dev/xhtml1')
20 files changed, 161 insertions, 151 deletions
diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht index 0d4a1f7f1ad..dfd7cab6a7c 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/chapter-4.xht @@ -508,102 +508,102 @@ <a href="#s4.4">+</a> <a href="http://www.w3.org/TR/css-grid-1/#min-size-auto">4.4 Implied Minimum Size of Grid Items</a></th></tr> <!-- 9 tests --> - <tr id="grid-minimun-size-grid-items-001-4.4" class="primary ahem"> + <tr id="grid-minimum-size-grid-items-001-4.4" class="primary ahem"> <td><strong> - <a href="grid-minimun-size-grid-items-001.xht">grid-minimun-size-grid-items-001</a></strong></td> + <a href="grid-minimum-size-grid-items-001.xht">grid-minimum-size-grid-items-001</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td> - <td>Minimun size of grid items + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the min-content size.</li> + <li>Checks that minimum size for grid items is the min-content size.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-002-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-002-4.4" class="primary"> <td><strong> - <a href="grid-minimun-size-grid-items-002.xht">grid-minimun-size-grid-items-002</a></strong></td> + <a href="grid-minimum-size-grid-items-002.xht">grid-minimum-size-grid-items-002</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td></td> - <td>Minimun size of grid items + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the min-content size.</li> + <li>Checks that minimum size for grid items is the min-content size.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-003-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-003-4.4" class="primary"> <td><strong> - <a href="grid-minimun-size-grid-items-003.xht">grid-minimun-size-grid-items-003</a></strong></td> + <a href="grid-minimum-size-grid-items-003.xht">grid-minimum-size-grid-items-003</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td></td> - <td>Minimun size of grid items + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li> + <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-004-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-004-4.4" class="primary"> <td><strong> - <a href="grid-minimun-size-grid-items-004.xht">grid-minimun-size-grid-items-004</a></strong></td> + <a href="grid-minimum-size-grid-items-004.xht">grid-minimum-size-grid-items-004</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td></td> - <td>Minimun size of grid items + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the specified size regardless of the content size.</li> + <li>Checks that minimum size for grid items is the specified size regardless of the content size.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-005-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-005-4.4" class="primary image"> <td><strong> - <a href="grid-minimun-size-grid-items-005.xht">grid-minimun-size-grid-items-005</a></strong></td> + <a href="grid-minimum-size-grid-items-005.xht">grid-minimum-size-grid-items-005</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td></td> - <td>Minimun size of grid items + <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the min-content size.</li> + <li>Checks that minimum size for grid items is the min-content size.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-006-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-006-4.4" class="primary image"> <td><strong> - <a href="grid-minimun-size-grid-items-006.xht">grid-minimun-size-grid-items-006</a></strong></td> + <a href="grid-minimum-size-grid-items-006.xht">grid-minimum-size-grid-items-006</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td></td> - <td>Minimun size of grid items + <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li> + <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-007-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-007-4.4" class="primary image"> <td><strong> - <a href="grid-minimun-size-grid-items-007.xht">grid-minimun-size-grid-items-007</a></strong></td> + <a href="grid-minimum-size-grid-items-007.xht">grid-minimum-size-grid-items-007</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td></td> - <td>Minimun size of grid items + <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that.</li> + <li>Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-008-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-008-4.4" class="primary image"> <td><strong> - <a href="grid-minimun-size-grid-items-008.xht">grid-minimun-size-grid-items-008</a></strong></td> + <a href="grid-minimum-size-grid-items-008.xht">grid-minimum-size-grid-items-008</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td></td> - <td>Minimun size of grid items + <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li> + <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li> </ul> </td> </tr> - <tr id="grid-minimun-size-grid-items-009-4.4" class="primary"> + <tr id="grid-minimum-size-grid-items-009-4.4" class="primary image"> <td><strong> - <a href="grid-minimun-size-grid-items-009.xht">grid-minimun-size-grid-items-009</a></strong></td> + <a href="grid-minimum-size-grid-items-009.xht">grid-minimum-size-grid-items-009</a></strong></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td></td> - <td>Minimun size of grid items + <td><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> + <td>Minimum size of grid items <ul class="assert"> - <li>Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li> + <li>Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that.</li> </ul> </td> </tr> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht index 4c74d156191..f9dbab0e890 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-001.xht @@ -20,7 +20,6 @@ display: inline-grid; font: 25px/1 Ahem; color: green; - grid-template-columns: auto auto; } ]]></style> </head> @@ -33,9 +32,7 @@ em <div>it</div> em - </div> - <br /> - <div class="test-inline-grid-overlapping-green"> + </div><div class="test-inline-grid-overlapping-green"> it <span>em</span> it diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht index 46b9db8fd13..10acc79dae9 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-items-002.xht @@ -21,17 +21,13 @@ font: 25px/1 Ahem; color: green; } - - .two-columns { - grid-template-columns: auto auto; - } ]]></style> </head> <body> <p>Test passes if there is a filled green square and <strong>no red</strong>.</p> <div id="reference-overlapped-red"></div> - <div class="test-inline-grid-overlapping-green two-columns"> + <div class="test-inline-grid-overlapping-green"> <div> <div>it</div> em @@ -40,14 +36,18 @@ it <div>em</div> </div> - </div> - <br /> - <div class="test-inline-grid-overlapping-green"> + </div><div class="test-inline-grid-overlapping-green"> + <span> + <span>i</span>t + </span> + <span> + e<span>m</span> + </span> <span> - <span>it</span>em + <span>i</span>t </span> <span> - it<span>em</span> + e<span>m</span> </span> </div> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht index 9796d30b34f..228536737c5 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-flexible-lengths-001.xht @@ -34,10 +34,10 @@ TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px"); + TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px"); + TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px"); + TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px"); + TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px"); TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px"); diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht index 66ec77c3bef..74d1672cdfc 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-inline-support-grid-template-areas-001.xht @@ -28,29 +28,29 @@ TestingUtils.testGridTemplateAreas('inline-grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"'); TestingUtils.testGridTemplateAreas('inline-grid', '"a b"', '"a b"'); TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "c d"', '"a b" "c d"'); - TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "c d"', '"a b" "c d"'); + TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "c d"', ['"a b" "c d"', '"a b" "c d"']); TestingUtils.testGridTemplateAreas('inline-grid', '"a b""c d"', '"a b" "c d"'); TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\t"c d"', '"a b" "c d"'); TestingUtils.testGridTemplateAreas('inline-grid', '"a b"\n"c d"', '"a b" "c d"'); TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "a b"', '"a b" "a b"'); TestingUtils.testGridTemplateAreas('inline-grid', '"a a" "b b"', '"a a" "b b"'); TestingUtils.testGridTemplateAreas('inline-grid', '". a ." "b a c"', '". a ." "b a c"'); - TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', '". a ." "b a c"'); - TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', '". a ." "b a c"'); + TestingUtils.testGridTemplateAreas('inline-grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']); + TestingUtils.testGridTemplateAreas('inline-grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']); TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."'); - TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."'); - TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."'); + TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']); + TestingUtils.testGridTemplateAreas('inline-grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']); TestingUtils.testGridTemplateAreas('inline-grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."'); - TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."'); - TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."'); + TestingUtils.testGridTemplateAreas('inline-grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']); + TestingUtils.testGridTemplateAreas('inline-grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']); TestingUtils.testGridTemplateAreas('inline-grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"'); TestingUtils.testGridTemplateAreas('inline-grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"'); TestingUtils.testGridTemplateAreas('inline-grid', '". a" "b a" ". a"', '". a" "b a" ". a"'); - TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', '". a" "b a" ". a"'); - TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', '". a" "b a" ". a"'); + TestingUtils.testGridTemplateAreas('inline-grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']); + TestingUtils.testGridTemplateAreas('inline-grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']); TestingUtils.testGridTemplateAreas('inline-grid', '"a a a" "b b b"', '"a a a" "b b b"'); TestingUtils.testGridTemplateAreas('inline-grid', '". ." "a a"', '". ." "a a"'); - TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', '". ." "a a"'); + TestingUtils.testGridTemplateAreas('inline-grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']); // Reset values. document.getElementById('inline-grid').style.gridTemplateAreas = ''; @@ -69,7 +69,7 @@ TestingUtils.testGridTemplateAreas('inline-grid', '"b a" "b b"', 'none'); TestingUtils.testGridTemplateAreas('inline-grid', '"a b" "b a"', 'none'); TestingUtils.testGridTemplateAreas('inline-grid', '"a ." ". a"', 'none'); - TestingUtils.testGridTemplateAreas('inline-grid', '","', '","'); + TestingUtils.testGridTemplateAreas('inline-grid', '","', 'none'); TestingUtils.testGridTemplateAreas('inline-grid', '"10%"', 'none'); TestingUtils.testGridTemplateAreas('inline-grid', '"USD$"', 'none'); ]]></script> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-001.xht index 213738c9474..7efc9e9d6f4 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-001.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-001.xht @@ -1,12 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> <meta name="flags" content="ahem" /> - <meta name="assert" content="Checks that minimun size for grid items is the min-content size." /> + <meta name="assert" content="Checks that minimum size for grid items is the min-content size." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-002.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-002.xht index 07c91aadf38..8ee52b12a17 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-002.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-002.xht @@ -1,11 +1,11 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the min-content size." /> + <meta name="assert" content="Checks that minimum size for grid items is the min-content size." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-003.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-003.xht index 1d110e26c53..c8006f314fc 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-003.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-003.xht @@ -1,11 +1,11 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size." /> + <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-004.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-004.xht index 2b22bc7b19e..e27ac99791e 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-004.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-004.xht @@ -1,11 +1,11 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the specified size regardless of the content size." /> + <meta name="assert" content="Checks that minimum size for grid items is the specified size regardless of the content size." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-005.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-005.xht index e26b6cc9a03..c97286084e8 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-005.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-005.xht @@ -1,11 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the min-content size." /> + <meta name="flags" content="image" /> + <meta name="assert" content="Checks that minimum size for grid items is the min-content size." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; @@ -26,7 +27,7 @@ <div id="reference-overlapped-red"></div> <div id="constrained-grid"> - <img src="../support/100x100-green.png" /> + <img src="support/100x100-green.png" alt="Image download support must be enabled" /> </div> </body> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-007.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-006.xht index 1a55f1c652c..4262ce8c406 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-007.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-006.xht @@ -1,11 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that." /> + <meta name="flags" content="image" /> + <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; @@ -30,7 +31,7 @@ <div id="reference-overlapped-red"></div> <div id="constrained-grid"> - <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png" /> + <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled" /> </div> </body> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-006.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-007.xht index 53b18f7019b..0a1f23b6f6b 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-006.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-007.xht @@ -1,11 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the specified size, as the min-content size of the image corresponds to that." /> + <meta name="flags" content="image" /> + <meta name="assert" content="Checks that minimum size for grid items is the specified size, as the min-content size of the image corresponds to that." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; @@ -30,7 +31,7 @@ <div id="reference-overlapped-red"></div> <div id="constrained-grid"> - <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png" /> + <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled" /> </div> </body> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-009.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-008.xht index 3e314082e34..2b93fdbf062 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-009.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-008.xht @@ -1,11 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that." /> + <meta name="flags" content="image" /> + <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; @@ -30,7 +31,7 @@ <div id="reference-overlapped-red"></div> <div id="constrained-grid"> - <img id="test-grid-item-overlapping-green" src="../support/60x60-green.png" /> + <img id="test-grid-item-overlapping-green" src="support/200x200-green.png" alt="Image download support must be enabled" /> </div> </body> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-008.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-009.xht index 48517417ed8..05ffc8bbcf1 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimun-size-grid-items-008.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-minimum-size-grid-items-009.xht @@ -1,11 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>CSS Grid Layout Test: Minimun size of grid items</title> + <title>CSS Grid Layout Test: Minimum size of grid items</title> <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com" /> <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="4.4. Implied Minimum Size of Grid Items" /> <link rel="match" href="reference/ref-filled-green-100px-square.xht" /> - <meta name="assert" content="Checks that minimun size for grid items is the transferred size, as the min-content size of the image corresponds to that." /> + <meta name="flags" content="image" /> + <meta name="assert" content="Checks that minimum size for grid items is the transferred size, as the min-content size of the image corresponds to that." /> <style type="text/css"><![CDATA[ #reference-overlapped-red { position: absolute; @@ -30,7 +31,7 @@ <div id="reference-overlapped-red"></div> <div id="constrained-grid"> - <img id="test-grid-item-overlapping-green" src="../support/200x200-green.png" /> + <img id="test-grid-item-overlapping-green" src="support/60x60-green.png" alt="Image download support must be enabled" /> </div> </body> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht index 517760818af..b9a5abf4b8f 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-flexible-lengths-001.xht @@ -34,10 +34,10 @@ TestingUtils.testGridTemplateColumnsRows("grid", "2fr", "2fr", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("emptyGrid", "10fr", "10fr", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("grid", "10fr", "10fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "800px", "600px"); - TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "800px", "600px"); + TestingUtils.testGridTemplateColumnsRows("emptyGrid", "0.5fr", "0.5fr", "400px", "300px"); + TestingUtils.testGridTemplateColumnsRows("grid", "0.5fr", "0.5fr", "400px", "300px"); + TestingUtils.testGridTemplateColumnsRows("emptyGrid", ".5fr", ".5fr", "400px", "300px"); + TestingUtils.testGridTemplateColumnsRows("grid", ".5fr", ".5fr", "400px", "300px"); TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("grid", "minmax(1fr, 1000px)", "minmax(1fr, 700px)", "800px", "600px"); TestingUtils.testGridTemplateColumnsRows("emptyGrid", "minmax(100px, 1fr)", "minmax(100px, 1fr)", "800px", "600px"); diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht index ca30fb4c5a9..53eb7611c64 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/grid-support-grid-template-areas-001.xht @@ -28,29 +28,29 @@ TestingUtils.testGridTemplateAreas('grid', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"', '"lower UPPER 10 -minus _low 1-st ©copy_right line¶"'); TestingUtils.testGridTemplateAreas('grid', '"a b"', '"a b"'); TestingUtils.testGridTemplateAreas('grid', '"a b" "c d"', '"a b" "c d"'); - TestingUtils.testGridTemplateAreas('grid', '"a b" "c d"', '"a b" "c d"'); + TestingUtils.testGridTemplateAreas('grid', '"a b" "c d"', ['"a b" "c d"', '"a b" "c d"']); TestingUtils.testGridTemplateAreas('grid', '"a b""c d"', '"a b" "c d"'); TestingUtils.testGridTemplateAreas('grid', '"a b"\t"c d"', '"a b" "c d"'); TestingUtils.testGridTemplateAreas('grid', '"a b"\n"c d"', '"a b" "c d"'); TestingUtils.testGridTemplateAreas('grid', '"a b" "a b"', '"a b" "a b"'); TestingUtils.testGridTemplateAreas('grid', '"a a" "b b"', '"a a" "b b"'); TestingUtils.testGridTemplateAreas('grid', '". a ." "b a c"', '". a ." "b a c"'); - TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', '". a ." "b a c"'); - TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', '". a ." "b a c"'); + TestingUtils.testGridTemplateAreas('grid', '".. a ..." "b a c"', ['". a ." "b a c"', '".. a ..." "b a c"']); + TestingUtils.testGridTemplateAreas('grid', '".a..." "b a c"', ['". a ." "b a c"', '".a..." "b a c"']); TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ."', '"head head" "nav main" "foot ."'); - TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', '"head head" "nav main" "foot ."'); - TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', '"head head" "nav main" "foot ."'); + TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot ...."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot ...."']); + TestingUtils.testGridTemplateAreas('grid', '"head head" "nav main" "foot."', ['"head head" "nav main" "foot ."', '"head head" "nav main" "foot."']); TestingUtils.testGridTemplateAreas('grid', '". header header ." "nav main main main" "nav footer footer ."', '". header header ." "nav main main main" "nav footer footer ."'); - TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', '". header header ." "nav main main main" "nav footer footer ."'); - TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', '". header header ." "nav main main main" "nav footer footer ."'); + TestingUtils.testGridTemplateAreas('grid', '"... header header ...." "nav main main main" "nav footer footer ...."', ['". header header ." "nav main main main" "nav footer footer ."', '"... header header ...." "nav main main main" "nav footer footer ...."']); + TestingUtils.testGridTemplateAreas('grid', '"...header header...." "nav main main main" "nav footer footer...."', ['". header header ." "nav main main main" "nav footer footer ."', '"...header header...." "nav main main main" "nav footer footer...."']); TestingUtils.testGridTemplateAreas('grid', '"title stats" "score stats" "board board" "ctrls ctrls"', '"title stats" "score stats" "board board" "ctrls ctrls"'); TestingUtils.testGridTemplateAreas('grid', '"title board" "stats board" "score ctrls"', '"title board" "stats board" "score ctrls"'); TestingUtils.testGridTemplateAreas('grid', '". a" "b a" ". a"', '". a" "b a" ". a"'); - TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', '". a" "b a" ". a"'); - TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', '". a" "b a" ". a"'); + TestingUtils.testGridTemplateAreas('grid', '".. a" "b a" "... a"', ['". a" "b a" ". a"', '".. a" "b a" "... a"']); + TestingUtils.testGridTemplateAreas('grid', '"..a" "b a" ".a"', ['". a" "b a" ". a"', '"..a" "b a" ".a"']); TestingUtils.testGridTemplateAreas('grid', '"a a a" "b b b"', '"a a a" "b b b"'); TestingUtils.testGridTemplateAreas('grid', '". ." "a a"', '". ." "a a"'); - TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', '". ." "a a"'); + TestingUtils.testGridTemplateAreas('grid', '"... ...." "a a"', ['". ." "a a"', '"... ...." "a a"']); // Reset values. document.getElementById('grid').style.gridTemplateAreas = ''; @@ -69,7 +69,7 @@ TestingUtils.testGridTemplateAreas('grid', '"b a" "b b"', 'none'); TestingUtils.testGridTemplateAreas('grid', '"a b" "b a"', 'none'); TestingUtils.testGridTemplateAreas('grid', '"a ." ". a"', 'none'); - TestingUtils.testGridTemplateAreas('grid', '","', '","'); + TestingUtils.testGridTemplateAreas('grid', '","', 'none'); TestingUtils.testGridTemplateAreas('grid', '"10%"', 'none'); TestingUtils.testGridTemplateAreas('grid', '"USD$"', 'none'); ]]></script> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js index c4ceec3a805..202c865b15e 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reference/support/testing-utils.js @@ -18,11 +18,15 @@ var TestingUtils = (function() { }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle + "; and grid-template-rows: " + rowsStyle + ";"); } + function checkGridTemplateAreas(element, value) { + assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas"); + } + function testGridTemplateAreas(gridId, style, value) { test(function() { var grid = document.getElementById(gridId); grid.style.gridTemplateAreas = style; - assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas"); + checkGridTemplateAreas(grid, value); }, "'" + gridId + "' with: grid-template-areas: " + style + ";"); } diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht index 3789b0d3085..4a4822a5580 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest-toc.xht @@ -544,76 +544,76 @@ <td rowspan="1"></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-001" class="ahem"> + <tbody id="grid-minimum-size-grid-items-001" class="ahem"> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-001.xht">grid-minimun-size-grid-items-001</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-001.xht">grid-minimum-size-grid-items-001</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-002" class=""> + <tbody id="grid-minimum-size-grid-items-002" class=""> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-002.xht">grid-minimun-size-grid-items-002</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-002.xht">grid-minimum-size-grid-items-002</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td rowspan="1"></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-003" class=""> + <tbody id="grid-minimum-size-grid-items-003" class=""> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-003.xht">grid-minimun-size-grid-items-003</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-003.xht">grid-minimum-size-grid-items-003</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td rowspan="1"></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-004" class=""> + <tbody id="grid-minimum-size-grid-items-004" class=""> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-004.xht">grid-minimun-size-grid-items-004</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-004.xht">grid-minimum-size-grid-items-004</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> <td rowspan="1"></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-005" class=""> + <tbody id="grid-minimum-size-grid-items-005" class="image"> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-005.xht">grid-minimun-size-grid-items-005</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-005.xht">grid-minimum-size-grid-items-005</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td rowspan="1"></td> + <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-006" class=""> + <tbody id="grid-minimum-size-grid-items-006" class="image"> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-006.xht">grid-minimun-size-grid-items-006</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-006.xht">grid-minimum-size-grid-items-006</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td rowspan="1"></td> + <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-007" class=""> + <tbody id="grid-minimum-size-grid-items-007" class="image"> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-007.xht">grid-minimun-size-grid-items-007</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-007.xht">grid-minimum-size-grid-items-007</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td rowspan="1"></td> + <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-008" class=""> + <tbody id="grid-minimum-size-grid-items-008" class="image"> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-008.xht">grid-minimun-size-grid-items-008</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-008.xht">grid-minimum-size-grid-items-008</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td rowspan="1"></td> + <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> </tr> </tbody> - <tbody id="grid-minimun-size-grid-items-009" class=""> + <tbody id="grid-minimum-size-grid-items-009" class="image"> <tr> - <td rowspan="1" title="Minimun size of grid items"> - <a href="grid-minimun-size-grid-items-009.xht">grid-minimun-size-grid-items-009</a></td> + <td rowspan="1" title="Minimum size of grid items"> + <a href="grid-minimum-size-grid-items-009.xht">grid-minimum-size-grid-items-009</a></td> <td><a href="reference/ref-filled-green-100px-square.xht">=</a> </td> - <td rowspan="1"></td> + <td rowspan="1"><abbr class="image" title="Requires bitmap graphic support">Bitmaps</abbr></td> </tr> </tbody> <tbody id="grid-multicol-001" class=""> diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list index 70a68b699f9..e609f486ecd 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/reftest.list @@ -64,15 +64,15 @@ grid-layout-repeat-notation.xht == reference/grid-layout-repeat-notation-ref.xht grid-layout-z-order-a.xht == reference/grid-layout-z-order-ref.xht grid-layout-z-order-b.xht == reference/grid-layout-z-order-ref.xht grid-margins-no-collapse-001.xht == reference/grid-text-green-margin-no-collapse-ref.xht -grid-minimun-size-grid-items-001.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-002.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-003.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-004.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-005.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-006.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-007.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-008.xht == reference/ref-filled-green-100px-square.xht -grid-minimun-size-grid-items-009.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-001.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-002.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-003.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-004.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-005.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-006.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-007.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-008.xht == reference/ref-filled-green-100px-square.xht +grid-minimum-size-grid-items-009.xht == reference/ref-filled-green-100px-square.xht grid-multicol-001.xht == reference/ref-filled-green-100px-square.xht grid-order-property-auto-placement-001.xht == reference/grid-2x2-blue-yellow-lime-magenta.xht grid-order-property-auto-placement-002.xht == reference/grid-2x2-blue-yellow-lime-magenta.xht diff --git a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js index c4ceec3a805..202c865b15e 100644 --- a/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js +++ b/tests/wpt/css-tests/css-grid-1_dev/xhtml1/support/testing-utils.js @@ -18,11 +18,15 @@ var TestingUtils = (function() { }, "'" + gridId + "' with: grid-template-columns: " + columnsStyle + "; and grid-template-rows: " + rowsStyle + ";"); } + function checkGridTemplateAreas(element, value) { + assert_in_array(getComputedStyle(element).gridTemplateAreas, value, "gridTemplateAreas"); + } + function testGridTemplateAreas(gridId, style, value) { test(function() { var grid = document.getElementById(gridId); grid.style.gridTemplateAreas = style; - assert_equals(getComputedStyle(grid).gridTemplateAreas, value, "gridTemplateAreas"); + checkGridTemplateAreas(grid, value); }, "'" + gridId + "' with: grid-template-areas: " + style + ";"); } |