Changeset 256445 in webkit


Ignore:
Timestamp:
Feb 12, 2020 10:03:55 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

[css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
​https://bugs.webkit.org/show_bug.cgi?id=207534

Patch by Rossana Monteriso <​rmonteriso@igalia.com> on 2020-02-12
Reviewed by Javier Fernandez.

LayoutTests/imported/w3c:

Add grid-item-auto-margins-alignment tests, checked and adapted to WPT, with their expected.txt files.
Imported to WPT with this PR: ​https://github.com/web-platform-tests/wpt/pull/21509

  • web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt:
  • web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt:
  • web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html:
  • web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt:
  • web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html:
  • web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html:

LayoutTests:

Remove grid-item-auto-margins-alignment tests and their expected.txt files. These tests
are being replaced by adapted tests in the corresponding WPT test folder.

  • fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt: Removed.
  • fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt: Removed.
  • fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt: Removed.
  • fast/css-grid-layout/grid-item-auto-margins-alignment.html: Removed.
  • fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html: Removed.
  • fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html: Removed.
Location:
trunk/LayoutTests
Files:
3 added
3 deleted
2 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r256441 r256445  
     12020-02-12  Rossana Monteriso  <rmonteriso@igalia.com>
     2
     3        [css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
     4        https://bugs.webkit.org/show_bug.cgi?id=207534
     5
     6        Reviewed by Javier Fernandez.
     7
     8        Remove grid-item-auto-margins-alignment tests and their expected.txt files. These tests
     9        are being replaced by adapted tests in the corresponding WPT test folder.
     10
     11        * fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt: Removed.
     12        * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt: Removed.
     13        * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt: Removed.
     14        * fast/css-grid-layout/grid-item-auto-margins-alignment.html: Removed.
     15        * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html: Removed.
     16        * fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html: Removed.
     17
    1182020-02-12  Jacob Uphoff  <jacob_uphoff@apple.com>
    219

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r256381 r256445  
     12020-02-12  Rossana Monteriso  <rmonteriso@igalia.com>
     2
     3        [css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
     4        https://bugs.webkit.org/show_bug.cgi?id=207534
     5
     6        Reviewed by Javier Fernandez.
     7
     8        Add grid-item-auto-margins-alignment tests, checked and adapted to WPT, with their expected.txt files.
     9        Imported to WPT with this PR: https://github.com/web-platform-tests/wpt/pull/21509
     10
     11        * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt:
     12        * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt:
     13        * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html:
     14        * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt:
     15        * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html:
     16        * web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html:
     17
    1182020-02-11  Youenn Fablet  <youenn@apple.com>
    219

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html

    r256444 r256445  
    11<!DOCTYPE html>
    2 <html>
    3 <head>
    4 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
    5 <link href="resources/grid.css" rel="stylesheet">
    6 <link href="resources/grid-alignment.css" rel="stylesheet">
    7 <script src="../../resources/check-layout.js"></script>
     2<meta charset="utf-8">
     3<title>CSS Grid Layout test: align-self and justify-self with auto margins, vertical-lr</title>
     4<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
     5<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins">
     6<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-items">
     7<meta name="assert" content="This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied, both for LTR and RTL directions, vertical-lr writing mode.">
     8<meta name="flags" content="ahem">
     9<link rel="stylesheet" href="/css/support/grid.css">
     10<link rel="stylesheet" href="/css/support/alignment.css">
     11<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
     12<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     13
    814<style>
    9 body {
    10     margin: 0;
    11 }
    12 
    1315.grid {
    1416    grid-template-columns: 100px 100px;
    … …  
    2830.autoMargin { margin: auto; }
    2931</style>
    30 </head>
     32
     33<script src="/resources/testharness.js"></script>
     34<script src="/resources/testharnessreport.js"></script>
     35<script src="/resources/check-layout-th.js"></script>
     36
    3137<body onload="checkLayout('.grid')">
    3238
    33 <p>This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.</p>
     39<p>This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.</p>
    3440
    35 <p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
     41<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
    3642<div style="position: relative">
    3743    <div class="grid fit-content verticalLR itemsCenter">
    … …  
    4349</div>
    4450
    45 <p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
     51<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
    4652<div style="position: relative">
    4753    <div class="grid fit-content verticalLR">
    … …  
    5359</div>
    5460
    55 <p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
     61<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
    5662<div style="position: relative">
    5763    <div class="grid fit-content verticalLR itemsCenter">
    … …  
    6369</div>
    6470
    65 <p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
     71<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
    6672<div style="position: relative">
    6773    <div class="grid fit-content verticalLR">
    … …  
    7480
    7581<!-- direction RTL -->
    76 <p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
     82<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
    7783<div style="position: relative">
    7884    <div class="grid fit-content verticalLR itemsCenter directionRTL">
    … …  
    8591
    8692
    87 <p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
     93<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
    8894<div style="position: relative">
    8995    <div class="grid fit-content verticalLR directionRTL">
    … …  
    95101</div>
    96102
    97 <p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
     103<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
    98104<div style="position: relative">
    99105    <div class="grid fit-content verticalLR itemsCenter directionRTL">
    … …  
    106112
    107113
    108 <p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
     114<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
    109115<div style="position: relative">
    110116    <div class="grid fit-content verticalLR directionRTL">
    … …  
    117123
    118124</body>
    119 </html>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html

    r256444 r256445  
    11<!DOCTYPE html>
    2 <html>
    3 <head>
    4 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
    5 <link href="resources/grid.css" rel="stylesheet">
    6 <link href="resources/grid-alignment.css" rel="stylesheet">
    7 <script src="../../resources/check-layout.js"></script>
     2<meta charset="utf-8">
     3<title>CSS Grid Layout test: align-self and justify-self with auto margins, vertical-rl</title>
     4<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
     5<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins">
     6<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-items">
     7<meta name="assert" content="This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied, both for LTR and RTL directions, vertical-rl writing mode.">
     8<meta name="flags" content="ahem">
     9<link rel="stylesheet" href="/css/support/grid.css">
     10<link rel="stylesheet" href="/css/support/alignment.css">
     11<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
     12<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     13
    814<style>
    9 body {
    10     margin: 0;
    11 }
    12 
    1315.grid {
    1416    grid-template-columns: 100px 100px;
    … …  
    2830.autoMargin { margin: auto; }
    2931</style>
    30 </head>
     32
     33<script src="/resources/testharness.js"></script>
     34<script src="/resources/testharnessreport.js"></script>
     35<script src="/resources/check-layout-th.js"></script>
     36
    3137<body onload="checkLayout('.grid')">
    3238
    33 <p>This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.</p>
     39<p>This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.</p>
    3440
    35 <p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
     41<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
    3642<div style="position: relative">
    3743    <div class="grid fit-content verticalRL itemsCenter">
    … …  
    4349</div>
    4450
    45 <p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
     51<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
    4652<div style="position: relative">
    4753    <div class="grid fit-content verticalRL">
    … …  
    5359</div>
    5460
    55 <p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
     61<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
    5662<div style="position: relative">
    5763    <div class="grid fit-content verticalRL itemsCenter">
    … …  
    6369</div>
    6470
    65 <p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
     71<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
    6672<div style="position: relative">
    6773    <div class="grid fit-content verticalRL">
    … …  
    7480
    7581<!-- direction RTL -->
    76 <p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
     82<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
    7783<div style="position: relative">
    7884    <div class="grid fit-content verticalRL itemsCenter directionRTL">
    … …  
    8591
    8692
    87 <p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
     93<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
    8894<div style="position: relative">
    8995    <div class="grid fit-content verticalRL directionRTL">
    … …  
    95101</div>
    96102
    97 <p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
     103<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
    98104<div style="position: relative">
    99105    <div class="grid fit-content verticalRL itemsCenter directionRTL">
    … …  
    106112
    107113
    108 <p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
     114<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
    109115<div style="position: relative">
    110116    <div class="grid verticalRL directionRTL" data-expected-width="400" data-expected-height="200">
    … …  
    117123
    118124</body>
    119 </html>

  • trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html

    r256444 r256445  
    11<!DOCTYPE html>
    2 <html>
    3 <head>
    4 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
    5 <link href="resources/grid.css" rel="stylesheet">
    6 <link href="resources/grid-alignment.css" rel="stylesheet">
    7 <script src="../../resources/check-layout.js"></script>
     2<meta charset="utf-8">
     3<title>CSS Grid Layout test: align-self and justify-self with auto margins</title>
     4<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
     5<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins">
     6<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-items">
     7<meta name="assert" content="This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied, both for LTR and RTL directions.">
     8<meta name="flags" content="ahem">
     9<link rel="stylesheet" href="/css/support/grid.css">
     10<link rel="stylesheet" href="/css/support/alignment.css">
     11<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
     12<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     13
    814<style>
    9 body {
    10     margin: 0;
    11 }
    12 
    1315.grid {
    1416    grid-template-columns: 100px 100px;
    … …  
    2830.autoMargin { margin: auto; }
    2931</style>
    30 </head>
     32
     33<script src="/resources/testharness.js"></script>
     34<script src="/resources/testharnessreport.js"></script>
     35<script src="/resources/check-layout-th.js"></script>
     36
    3137<body onload="checkLayout('.grid')">
    3238
    33 <p>This test checks that aling-self and justify-self properties are not applied when there is auto-margin in the correponding axis. Instead, auto-margin alignment should be applied.</p>
     39<p>This test checks that align-self and justify-self properties are not applied when there is auto-margin in the corresponding axis. Instead, auto-margin alignment should be applied.</p>
    3440
    35 <p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
     41<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
    3642<div style="position: relative">
    3743    <div class="grid fit-content itemsCenter">
    … …  
    4349</div>
    4450
    45 <p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
     51<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
    4652<div style="position: relative">
    4753    <div class="grid fit-content">
    … …  
    5359</div>
    5460
    55 <p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
     61<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
    5662<div style="position: relative">
    5763    <div class="grid fit-content itemsCenter">
    … …  
    6369</div>
    6470
    65 <p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
     71<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
    6672<div style="position: relative">
    6773    <div class="grid fit-content">
    … …  
    7480
    7581<!-- direction RTL -->
    76 <p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
     82<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
    7783<div style="position: relative">
    7884    <div class="grid fit-content itemsCenter directionRTL">
    … …  
    8490</div>
    8591
    86 <p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
     92<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
    8793<div style="position: relative">
    8894    <div class="grid fit-content directionRTL">
    … …  
    94100</div>
    95101
    96 <p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
     102<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
    97103<div style="position: relative">
    98104    <div class="grid fit-content itemsCenter directionRTL">
    … …  
    104110</div>
    105111
    106 <p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
     112<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
    107113<div style="position: relative">
    108114    <div class="grid fit-content directionRTL">
    … …  
    115121
    116122</body>
    117 </html>
Note: See TracChangeset for help on using the changeset viewer.