Skip to content

GitLab

T
tangled
Commit bf83ece9 authored by Oriol Brufau's avatar Oriol Brufau Committed by Commit Bot
Browse files
Options

[css-grid] Fix grid-layout-properties.html WPT test 

This is a follow-up of r728894. It affected the behavior of the WPT test
grid-layout-properties.html, but I didn't notice it since it was marked
as failing.

Mozilla updated the test in https://bugzil.la/1599206, but they didn't
cover some cases that were already failing for them since Firefox
doesn't serialize shorthands.

Also, a case that used to expect "150px 50px 50px" should have been
changed to "150px" (removing the trailing implicit tracks), but Mozilla
changed it to "50px" since it's what they get due to a Firefox bug.

Here I'm fixing the test to expect the correct values, unmarking it as
failing, and adding an -expected.txt for the cases that fail due to
bug 511177.

BUG=1024927

Change-Id: I7ff8d248a708af273cd89d438ffd2692783a5bc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2002579Reviewed-by: default avatarJavier Fernandez <jfernandez@igalia.com>
Commit-Queue: Oriol Brufau <obrufau@igalia.com>
Cr-Commit-Position: refs/heads/master@{#732336}
parent 670c9969
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 6 deletions
third_party/blink/web_tests/FlagExpectations/layout-ng-fragment-item
View file @ bf83ece9
......@@ -607,7 +607,6 @@ crbug.com/982194 external/wpt/css/css-grid/alignment/grid-self-alignment-baselin
crbug.com/982194 external/wpt/css/css-grid/animation/grid-template-columns-001.html [ Failure ]
crbug.com/982194 external/wpt/css/css-grid/animation/grid-template-rows-001.html [ Failure ]
crbug.com/982194 external/wpt/css/css-grid/grid-child-percent-basis-resize-1.html [ Failure ]
crbug.com/982194 external/wpt/css/css-grid/grid-layout-properties.html [ Failure ]
crbug.com/982194 external/wpt/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html [ Failure ]
crbug.com/982194 external/wpt/css/css-images/tiled-gradients.html [ Failure ]
crbug.com/982194 external/wpt/css/css-intrinsic-size/intrinsic-size-015.html [ Crash Pass ]
......
third_party/blink/web_tests/TestExpectations
View file @ bf83ece9
......@@ -4131,7 +4131,6 @@ crbug.com/1005519 external/wpt/css/css-grid/alignment/grid-self-alignment-baseli
crbug.com/759665 external/wpt/css/css-grid/animation/grid-template-columns-001.html [ Failure ]
crbug.com/759665 external/wpt/css/css-grid/animation/grid-template-rows-001.html [ Failure ]
crbug.com/1018439 external/wpt/css/css-grid/grid-child-percent-basis-resize-1.html [ Failure ]
crbug.com/511177 external/wpt/css/css-grid/grid-layout-properties.html [ Failure ]
crbug.com/868380 external/wpt/css/css-grid/grid-model/grid-container-ignores-first-letter-002.html [ Failure ]
crbug.com/707359 [ Mac ] fast/css-grid-layout/grid-align-baseline-vertical.html [ Failure ]
crbug.com/707359 [ Mac ] fast/css-grid-layout/grid-self-baseline-03.html [ Failure ]
......
third_party/blink/web_tests/external/wpt/css/css-grid/grid-layout-properties-expected.txt 0 → 100644
View file @ bf83ece9
This is a testharness.js-based test.
Found 140 tests; 119 PASS, 21 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS display: grid
PASS display: inline-grid
PASS grid-template-columns
PASS grid-template-columns.initial
PASS grid-template-columns.none
PASS grid-template-columns.<line-names>
PASS grid-template-columns.<track-size>.auto
PASS grid-template-columns.<track-size>.<track-breadth>.<length>
PASS grid-template-columns.<track-size>.<track-breadth>.<percentage>
PASS grid-template-columns.<track-size>.<track-breadth>.<flex>
PASS grid-template-columns.<track-size>.<track-breadth>.min-content
PASS grid-template-columns.<track-size>.<track-breadth>.max-content
PASS grid-template-columns.<track-size>.<track-breadth>.minmax()
PASS grid-template-columns.reset
PASS grid-template-rows
PASS grid-template-rows.initial
PASS grid-template-rows.none
PASS grid-template-rows.<line-names>
PASS grid-template-rows.<track-size>.auto
PASS grid-template-rows.<track-size>.<track-breadth>.<length>
PASS grid-template-rows.<track-size>.<track-breadth>.<percentage>
PASS grid-template-rows.<track-size>.<track-breadth>.<flex>
PASS grid-template-rows.<track-size>.<track-breadth>.min-content
PASS grid-template-rows.<track-size>.<track-breadth>.max-content
PASS grid-template-rows.<track-size>.<track-breadth>.minmax()
PASS grid-template-rows.reset
PASS grid-template-areas
PASS grid-template-areas.initial
PASS grid-template-areas.none
PASS grid-template-areas.<string>+
PASS grid-template-areas.reset
PASS grid-template
FAIL grid-template.initial assert_equals: initial value of grid-template should be none expected "none" but got "none / none / none"
FAIL grid-template.none assert_equals: none expected "none" but got "none / none / none"
FAIL grid-template.<grid-template-rows> / <grid-template-columns> assert_equals: <grid-template-rows> / <grid-template-columns> expected "100px 100px / 200px 200px" but got ""
FAIL grid-template.<line-names> assert_equals: <line-names> expected "[a] auto [b] auto [c] / [d] auto [e] auto [f]" but got ""
FAIL grid-template.<string>+ assert_equals: <string>+ expected "\"a b\" \"a b\"" but got ""
FAIL grid-template.<string><track-size>+ assert_equals: <string><track-size>+ expected "100px / \"a b\" 50px" but got ""
FAIL grid-template.reset assert_equals: reset expected "none" but got "none / none / none"
PASS grid-auto-columns
PASS grid-auto-columns.initial
PASS grid-auto-columns.<track-size>.auto
PASS grid-auto-columns.<track-size>.<track-breadth>.<length>
PASS grid-auto-columns.<track-size>.<track-breadth>.<percentage>
PASS grid-auto-columns.<track-size>.<track-breadth>.<flex>
PASS grid-auto-columns.<track-size>.<track-breadth>.min-content
PASS grid-auto-columns.<track-size>.<track-breadth>.max-content
PASS grid-auto-columns.<track-size>.<track-breadth>.minmax()
PASS grid-auto-columns.reset
PASS grid-auto-rows
PASS grid-auto-rows.initial
PASS grid-auto-rows.<track-size>.auto
PASS grid-auto-rows.<track-size>.<track-breadth>.<length>
PASS grid-auto-rows.<track-size>.<track-breadth>.<percentage>
PASS grid-auto-rows.<track-size>.<track-breadth>.<flex>
PASS grid-auto-rows.<track-size>.<track-breadth>.min-content
PASS grid-auto-rows.<track-size>.<track-breadth>.max-content
PASS grid-auto-rows.<track-size>.<track-breadth>.minmax()
PASS grid-auto-rows.reset
PASS grid-auto-flow
PASS grid-auto-flow.initial
PASS grid-auto-flow.row
PASS grid-auto-flow.column
FAIL grid-auto-flow.dense assert_equals: dense expected "dense" but got "row dense"
FAIL grid-auto-flow.row dense assert_equals: row dense expected "dense" but got "row dense"
PASS grid-auto-flow.column dense
PASS grid-auto-flow.reset
PASS grid-row-start
PASS grid-row-start.initial
PASS grid-row-start.auto
PASS grid-row-start.<custom-ident>
PASS grid-row-start.<integer>
PASS grid-row-start.<integer> <ident>
PASS grid-row-start.span <integer>
PASS grid-row-start.span <custom-ident>
PASS grid-row-start.span <integer> <custom-ident>
PASS grid-row-start.reset
PASS grid-column-start
PASS grid-column-start.initial
PASS grid-column-start.auto
PASS grid-column-start.<custom-ident>
PASS grid-column-start.<integer>
PASS grid-column-start.<integer> <ident>
PASS grid-column-start.span <integer>
PASS grid-column-start.span <custom-ident>
PASS grid-column-start.span <integer> <custom-ident>
PASS grid-column-start.reset
PASS grid-row-end
PASS grid-row-end.initial
PASS grid-row-end.auto
PASS grid-row-end.<custom-ident>
PASS grid-row-end.<integer>
PASS grid-row-end.<integer> <ident>
PASS grid-row-end.span <integer>
PASS grid-row-end.span <custom-ident>
PASS grid-row-end.span <integer> <custom-ident>
PASS grid-row-end.reset
PASS grid-column-end
PASS grid-column-end.initial
PASS grid-column-end.auto
PASS grid-column-end.<custom-ident>
PASS grid-column-end.<integer>
PASS grid-column-end.<integer> <ident>
PASS grid-column-end.span <integer>
PASS grid-column-end.span <custom-ident>
PASS grid-column-end.span <integer> <custom-ident>
PASS grid-column-end.reset
PASS grid-column
FAIL grid-column.initial assert_equals: initial value of grid-column should be auto expected "auto" but got "auto / auto"
FAIL grid-column.auto assert_equals: auto expected "auto" but got "auto / auto"
PASS grid-column.<custom-ident>
FAIL grid-column.<integer> start assert_equals: <integer> start expected "1" but got "1 / auto"
PASS grid-column.<integer>
PASS grid-column.<integer> <ident>
PASS grid-column.span <integer>
PASS grid-column.span <custom-ident>
PASS grid-column.span <integer> <custom-ident>
FAIL grid-column.reset assert_equals: reset expected "auto" but got "auto / auto"
PASS grid-row
FAIL grid-row.initial assert_equals: initial value of grid-row should be auto expected "auto" but got "auto / auto"
FAIL grid-row.auto assert_equals: auto expected "auto" but got "auto / auto"
PASS grid-row.<custom-ident>
FAIL grid-row.<integer> start assert_equals: <integer> start expected "1" but got "1 / auto"
PASS grid-row.<integer>
PASS grid-row.<integer> <ident>
PASS grid-row.span <integer>
PASS grid-row.span <custom-ident>
PASS grid-row.span <integer> <custom-ident>
FAIL grid-row.reset assert_equals: reset expected "auto" but got "auto / auto"
PASS grid-area
FAIL grid-area.initial assert_equals: initial value of grid-area should be auto expected "auto" but got "auto / auto / auto / auto"
FAIL grid-area.auto assert_equals: auto expected "auto" but got "auto / auto / auto / auto"
PASS grid-area.<custom-ident>
FAIL grid-area.<integer> start assert_equals: <integer> start expected "1 / 2" but got "1 / 2 / auto / auto"
PASS grid-area.<integer>
PASS grid-area.<integer> <ident>
PASS grid-area.span <integer>
PASS grid-area.span <custom-ident>
PASS grid-area.span <integer> <custom-ident>
FAIL grid-area.reset assert_equals: reset expected "auto" but got "auto / auto / auto / auto"
Harness: the test ran to completion.
third_party/blink/web_tests/external/wpt/css/css-grid/grid-layout-properties.html
View file @ bf83ece9
......@@ -97,7 +97,7 @@
'<line-names>': ['[a] auto [b] auto [c]', '[a] 50px [b] 50px [c]'],
'<track-size>.auto': ['auto', '50px'],
'<track-size>.<track-breadth>.<length>': ['100px', '100px'],
'<track-size>.<track-breadth>.<percentage>': ['100%', '50px'],
'<track-size>.<track-breadth>.<percentage>': ['100%', '150px'],
'<track-size>.<track-breadth>.<flex>': ['1fr', '50px'],
'<track-size>.<track-breadth>.min-content': ['min-content', '50px'],
'<track-size>.<track-breadth>.max-content': ['max-content', '50px'],
......@@ -111,13 +111,13 @@
'reset': ['none', 'none'],
},
'grid-template': {
initial: '150px / 50px 50px 50px',
'none': ['', '150px / 50px 50px 50px'],
initial: 'none',
'none': ['', 'none'],
'<grid-template-rows> / <grid-template-columns>': ['100px 100px / 200px 200px', '100px 100px / 200px 200px'],
'<line-names>': ['[a] auto [b] auto [c] / [d] auto [e] auto [f]', '[a] auto [b] auto [c] / [d] auto [e] auto [f]'],
'<string>+': ['"a b" "a b"', '"a b" "a b"'],
'<string><track-size>+': ['100px / "a b" 50px', '100px / "a b" 50px'],
'reset': ['', '150px / 50px 50px 50px'],
'reset': ['', 'none'],
},
'grid-auto-columns': {
initial: 'auto',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment