Bug 1425227: Fix grid-layout-properties.html to not depend on buggy Blink / WebKit behavior. r?heycam
See https://bugzilla.mozilla.org/show_bug.cgi?id=1425678.
MozReview-Commit-ID: D9MTTyHUz8R
--- a/testing/web-platform/meta/css/css-grid/grid-layout-properties.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-layout-properties.html.ini
@@ -1,296 +1,48 @@
[grid-layout-properties.html]
type: testharness
- [grid-template-columns]
- expected: FAIL
- [grid-template-columns.none]
- expected: FAIL
-
- [grid-template-columns.<line-names>]
- expected: FAIL
-
- [grid-template-columns.<track-size>.auto]
- expected: FAIL
-
- [grid-template-columns.<track-size>.<track-breadth>.<length>]
- expected: FAIL
-
- [grid-template-columns.<track-size>.<track-breadth>.<percentage>]
- expected: FAIL
-
- [grid-template-columns.<track-size>.<track-breadth>.<flex>]
- expected: FAIL
-
- [grid-template-columns.<track-size>.<track-breadth>.min-content]
- expected: FAIL
-
- [grid-template-columns.<track-size>.<track-breadth>.max-content]
- expected: FAIL
-
- [grid-template-columns.<track-size>.<track-breadth>.minmax()]
- expected: FAIL
-
- [grid-template-columns.reset]
- expected: FAIL
-
- [grid-template-rows]
- expected: FAIL
-
- [grid-template-rows.none]
- expected: FAIL
-
- [grid-template-rows.<line-names>]
- expected: FAIL
-
- [grid-template-rows.<track-size>.auto]
- expected: FAIL
-
- [grid-template-rows.<track-size>.<track-breadth>.<length>]
- expected: FAIL
-
- [grid-template-rows.<track-size>.<track-breadth>.<percentage>]
- expected: FAIL
-
- [grid-template-rows.<track-size>.<track-breadth>.<flex>]
- expected: FAIL
-
- [grid-template-rows.<track-size>.<track-breadth>.min-content]
- expected: FAIL
-
- [grid-template-rows.<track-size>.<track-breadth>.max-content]
- expected: FAIL
-
- [grid-template-rows.<track-size>.<track-breadth>.minmax()]
- expected: FAIL
-
- [grid-template-rows.reset]
- expected: FAIL
-
- [grid-template-areas]
- expected: FAIL
-
- [grid-template-areas.none]
- expected: FAIL
-
- [grid-template-areas.<string>+]
- expected: FAIL
-
- [grid-template-areas.reset]
- expected: FAIL
-
- [grid-template]
+ [grid-template.none]
expected: FAIL
[grid-template.initial]
expected: FAIL
- [grid-template.none]
- expected: FAIL
-
[grid-template.<grid-template-rows> / <grid-template-columns>]
expected: FAIL
[grid-template.<line-names>]
expected: FAIL
[grid-template.<string>+]
expected: FAIL
[grid-template.<string><track-size>+]
expected: FAIL
[grid-template.reset]
expected: FAIL
- [grid-auto-columns]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.auto]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.<track-breadth>.<length>]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.<track-breadth>.<percentage>]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.<track-breadth>.<flex>]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.<track-breadth>.min-content]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.<track-breadth>.max-content]
- expected: FAIL
-
- [grid-auto-columns.<track-size>.<track-breadth>.minmax()]
- expected: FAIL
-
- [grid-auto-columns.reset]
- expected: FAIL
-
- [grid-auto-rows]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.auto]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.<track-breadth>.<length>]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.<track-breadth>.<percentage>]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.<track-breadth>.<flex>]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.<track-breadth>.min-content]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.<track-breadth>.max-content]
- expected: FAIL
-
- [grid-auto-rows.<track-size>.<track-breadth>.minmax()]
- expected: FAIL
-
- [grid-auto-rows.reset]
- expected: FAIL
-
- [grid-auto-flow]
- expected: FAIL
-
- [grid-auto-flow.row]
- expected: FAIL
-
- [grid-auto-flow.column]
- expected: FAIL
-
[grid-auto-flow.dense]
expected: FAIL
- [grid-auto-flow.row dense]
- expected: FAIL
-
- [grid-auto-flow.column dense]
- expected: FAIL
-
- [grid-auto-flow.reset]
- expected: FAIL
-
- [grid-row-start]
- expected: FAIL
-
- [grid-row-start.auto]
- expected: FAIL
-
- [grid-row-start.<custom-ident>]
- expected: FAIL
-
- [grid-row-start.<integer>]
- expected: FAIL
-
- [grid-row-start.<integer> <ident>]
- expected: FAIL
-
- [grid-row-start.span <integer>]
- expected: FAIL
-
[grid-row-start.span <custom-ident>]
expected: FAIL
- [grid-row-start.span <integer> <custom-ident>]
- expected: FAIL
-
- [grid-row-start.reset]
- expected: FAIL
-
- [grid-column-start]
- expected: FAIL
-
- [grid-column-start.auto]
- expected: FAIL
-
- [grid-column-start.<custom-ident>]
- expected: FAIL
-
- [grid-column-start.<integer>]
- expected: FAIL
-
- [grid-column-start.<integer> <ident>]
- expected: FAIL
-
- [grid-column-start.span <integer>]
- expected: FAIL
-
[grid-column-start.span <custom-ident>]
expected: FAIL
- [grid-column-start.span <integer> <custom-ident>]
- expected: FAIL
-
- [grid-column-start.reset]
- expected: FAIL
-
- [grid-row-end]
- expected: FAIL
-
- [grid-row-end.auto]
- expected: FAIL
-
- [grid-row-end.<custom-ident>]
- expected: FAIL
-
- [grid-row-end.<integer>]
- expected: FAIL
-
- [grid-row-end.<integer> <ident>]
- expected: FAIL
-
- [grid-row-end.span <integer>]
- expected: FAIL
-
[grid-row-end.span <custom-ident>]
expected: FAIL
- [grid-row-end.span <integer> <custom-ident>]
- expected: FAIL
-
- [grid-row-end.reset]
- expected: FAIL
-
- [grid-column-end]
- expected: FAIL
-
- [grid-column-end.auto]
- expected: FAIL
-
- [grid-column-end.<custom-ident>]
- expected: FAIL
-
- [grid-column-end.<integer>]
- expected: FAIL
-
- [grid-column-end.<integer> <ident>]
- expected: FAIL
-
- [grid-column-end.span <integer>]
- expected: FAIL
-
[grid-column-end.span <custom-ident>]
expected: FAIL
- [grid-column-end.span <integer> <custom-ident>]
- expected: FAIL
-
- [grid-column-end.reset]
- expected: FAIL
-
- [grid-column]
+ [grid-column.reset]
expected: FAIL
[grid-column.initial]
expected: FAIL
[grid-column.auto]
expected: FAIL
@@ -310,22 +62,16 @@
expected: FAIL
[grid-column.span <custom-ident>]
expected: FAIL
[grid-column.span <integer> <custom-ident>]
expected: FAIL
- [grid-column.reset]
- expected: FAIL
-
- [grid-row]
- expected: FAIL
-
[grid-row.initial]
expected: FAIL
[grid-row.auto]
expected: FAIL
[grid-row.<custom-ident>]
expected: FAIL
@@ -346,19 +92,16 @@
expected: FAIL
[grid-row.span <integer> <custom-ident>]
expected: FAIL
[grid-row.reset]
expected: FAIL
- [grid-area]
- expected: FAIL
-
[grid-area.initial]
expected: FAIL
[grid-area.auto]
expected: FAIL
[grid-area.<custom-ident>]
expected: FAIL
--- a/testing/web-platform/tests/css/css-grid/grid-layout-properties.html
+++ b/testing/web-platform/tests/css/css-grid/grid-layout-properties.html
@@ -49,29 +49,29 @@
}, 'display: inline-grid')
void function(data){
myDiv.style.display = 'grid'
Object.keys(data).forEach(function(prop){
test(function(){
- assert_own_property(myDiv.style, prop)
+ assert_true(prop in myDiv.style)
}, prop)
if ('initial' in data[prop]) test(function(){
var initial = data[prop].initial
delete data[prop].initial
assert_equals(getComputedStyle(myDiv)[prop], initial, 'initial value of ' + prop + ' should be ' + initial)
}, prop + '.initial')
var syntaxTests = data[prop]
Object.keys(syntaxTests).forEach(function(testcase){
test(function(){
- assert_own_property(myDiv.style, prop)
+ assert_true(prop in myDiv.style)
myDiv.style[prop] = syntaxTests[testcase][0]
assert_equals(myDiv.style[prop], syntaxTests[testcase][0], testcase)
assert_equals(getComputedStyle(myDiv)[prop], syntaxTests[testcase][1], testcase)
}, prop + '.' + testcase)
})
})
}({