Skip to content

GitLab

T
tangled
Commit f783df97 authored by Mario Sanchez Prada's avatar Mario Sanchez Prada Committed by Commit Bot
Browse files
Options

[css-grid] Migrate flex-content-resolution-rows to WPT 

Migrate this test out of blink/web_tests/fast/css-grid-layout
and into the WPT-specific directory, adding links to the relevant
specs and a test assertion describing its purpose.

Additionally, migrate this test from being a testRunner-based reftest
with plain text expectation into a testharness.js-based test that uses
check-layout-th.js instead of the utils from the Chromium-specific
check-layout.js file, and drop the expectations file.

Last, this renames flex-and-minmax-content-resolution-rows-001.html
into flex-content-resolution-rows-002.html, since such test is related
to the one being migrated here, and that way it makes things a bit
more consistent.

Bug: 767015, 1063749
Change-Id: I7326d7af76e04cbb3b5634a8e59bcfd36fcc92d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148597Reviewed-by: default avatarChristian Biesinger <cbiesinger@chromium.org>
Reviewed-by: default avatarManuel Rego <rego@igalia.com>
Commit-Queue: Mario Sanchez Prada <mario@igalia.com>
Cr-Commit-Position: refs/heads/master@{#759181}
parent a9b484ec
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 42 deletions
third_party/blink/web_tests/fast/css-grid-layout/flex-content-resolution-rows.html → third_party/blink/web_tests/external/wpt/css/css-grid/grid-definition/flex-content-resolution-rows-001.html
View file @ f783df97
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<link href="resources/grid.css" rel="stylesheet"> <title>CSS Grid Layout Test: Auto repeat tracks, grid-template-rows and flexible lengths.</title>
<link rel="author" title="Julien Chaffraix" href="mailto:jchaffraix@chromium.org">
<link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizes">
<link rel="help" href="https://drafts.csswg.org/css-grid-1/#fr-unit">
<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=235258">
<link rel="stylesheet" href="/fonts/ahem.css">
<link rel="stylesheet" href="/css/support/grid.css">
<meta name="assert" content="Test that resolving auto tracks on grid items using <flex> values with grid-template-rows works properly." />
<style> <style>
.gridFlexContent { .gridFlexContent {
grid-template-columns: 50px; grid-template-columns: 50px;
...@@ -40,11 +48,15 @@ ...@@ -40,11 +48,15 @@
grid-row: 3; grid-row: 3;
} }
</style> </style>
<script src="../../resources/check-layout.js"></script>
<body onload="checkLayout('.grid');">
<p>Test that resolving auto tracks on grid items works properly.</p> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/check-layout-th.js"></script>
<script type="text/javascript">
setup({ explicit_done: true });
</script>
<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
<div class="grid gridFlexContent constrainedContainer" style="position: relative;"> <div class="grid gridFlexContent constrainedContainer" style="position: relative;">
<div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="30">X<br>X<br>X</div> <div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="30">X<br>X<br>X</div>
......
third_party/blink/web_tests/external/wpt/css/css-grid/grid-definition/flex-and-minmax-content-resolution-rows-001.html → third_party/blink/web_tests/external/wpt/css/css-grid/grid-definition/flex-content-resolution-rows-002.html
View file @ f783df97
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
<body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })"> <body onload="document.fonts.ready.then(() => { checkLayout('.grid'); })">
<p>Test that resolving auto tracks on grid items works properly.</p>
<div class="constrainedContainer"> <div class="constrainedContainer">
<div class="grid gridMaxMaxContent"> <div class="grid gridMaxMaxContent">
<div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10">XXXXX</div> <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="50" data-expected-height="10">XXXXX</div>
......
third_party/blink/web_tests/fast/css-grid-layout/flex-content-resolution-rows-expected.txt deleted 100644 → 0
View file @ a9b484ec
Test that resolving auto tracks on grid items works properly.
X
X
X
X
X
X
X
X
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
PASS
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