[css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2020 18:03:55 +0000 (18:03 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Feb 2020 18:03:55 +0000 (18:03 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@256445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt [deleted file]
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt [deleted file]
LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt [deleted file]
LayoutTests/imported/w3c/ChangeLog
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr.html [moved from LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr.html with 79% similarity]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt [new file with mode: 0644]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl.html [moved from LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl.html with 79% similarity]
LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment.html [moved from LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment.html with 79% similarity]

index 68a6dcc..879d353 100644 (file)
@@ -1,3 +1,20 @@
+2020-02-12  Rossana Monteriso  <rmonteriso@igalia.com>
+
+        [css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
+        https://bugs.webkit.org/show_bug.cgi?id=207534
+
+        Reviewed by Javier Fernandez.
+
+        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.
+
 2020-02-12  Jacob Uphoff  <jacob_uphoff@apple.com>
 
         [ macOS wk2 ] webgpu/whlsl/whlsl.html
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-expected.txt
deleted file mode 100644 (file)
index 11f5eaa..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-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.
-
-Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-lr-expected.txt
deleted file mode 100644 (file)
index 11f5eaa..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-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.
-
-Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
diff --git a/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt b/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-alignment-vertical-rl-expected.txt
deleted file mode 100644 (file)
index 11f5eaa..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-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.
-
-Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin
-
-PASS
-Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin
-
-PASS
index 0aec8a1..9530db1 100644 (file)
@@ -1,3 +1,20 @@
+2020-02-12  Rossana Monteriso  <rmonteriso@igalia.com>
+
+        [css-grid] Move grid-item-auto-margins-alignment tests to WPT folder
+        https://bugs.webkit.org/show_bug.cgi?id=207534
+
+        Reviewed by Javier Fernandez.
+
+        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:
+
 2020-02-11  Youenn Fablet  <youenn@apple.com>
 
         Parent service worker controller should be used for child iframe as per https://w3c.github.io/ServiceWorker/#control-and-use-window-client
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-expected.txt
new file mode 100644 (file)
index 0000000..a432364
--- /dev/null
@@ -0,0 +1,28 @@
+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.
+
+Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin
+
+
+PASS .grid 1 
+PASS .grid 2 
+PASS .grid 3 
+PASS .grid 4 
+PASS .grid 5 
+PASS .grid 6 
+PASS .grid 7 
+PASS .grid 8 
+
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-lr-expected.txt
new file mode 100644 (file)
index 0000000..a432364
--- /dev/null
@@ -0,0 +1,28 @@
+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.
+
+Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin
+
+
+PASS .grid 1 
+PASS .grid 2 
+PASS .grid 3 
+PASS .grid 4 
+PASS .grid 5 
+PASS .grid 6 
+PASS .grid 7 
+PASS .grid 8 
+
@@ -1,15 +1,17 @@
 <!DOCTYPE html>
-<html>
-<head>
-<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
-<link href="resources/grid.css" rel="stylesheet">
-<link href="resources/grid-alignment.css" rel="stylesheet">
-<script src="../../resources/check-layout.js"></script>
-<style>
-body {
-    margin: 0;
-}
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-self and justify-self with auto margins, vertical-lr</title>
+<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-items">
+<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.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 
+<style>
 .grid {
     grid-template-columns: 100px 100px;
     grid-template-rows: 200px 200px;
@@ -27,12 +29,16 @@ body {
 .autoMarginLeft { margin-left: auto; }
 .autoMargin { margin: auto; }
 </style>
-</head>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
 <body onload="checkLayout('.grid')">
 
-<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>
+<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>
 
-<p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
+<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR itemsCenter">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
@@ -42,7 +48,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
+<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
@@ -52,7 +58,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
+<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR itemsCenter">
         <div class="autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="60" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -62,7 +68,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
+<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR">
         <div class="autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -73,7 +79,7 @@ body {
 </div>
 
 <!-- direction RTL -->
-<p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
+<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR itemsCenter directionRTL">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
@@ -84,7 +90,7 @@ body {
 </div>
 
 
-<p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
+<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR directionRTL">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
@@ -94,7 +100,7 @@ body {
     </div>
 </div>
 
-<p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
+<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR itemsCenter directionRTL">
         <div class="autoMarginTop firstRowFirstColumn" data-offset-x="90" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -105,7 +111,7 @@ body {
 </div>
 
 
-<p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
+<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalLR directionRTL">
         <div class="autoMargin firstRowFirstColumn" data-offset-x="90" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -115,5 +121,4 @@ body {
     </div>
 </div>
 
-</body>
-</html>
+</body>
\ No newline at end of file
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid/alignment/grid-item-auto-margins-alignment-vertical-rl-expected.txt
new file mode 100644 (file)
index 0000000..a432364
--- /dev/null
@@ -0,0 +1,28 @@
+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.
+
+Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin
+
+Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin
+
+Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin
+
+
+PASS .grid 1 
+PASS .grid 2 
+PASS .grid 3 
+PASS .grid 4 
+PASS .grid 5 
+PASS .grid 6 
+PASS .grid 7 
+PASS .grid 8 
+
@@ -1,15 +1,17 @@
 <!DOCTYPE html>
-<html>
-<head>
-<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
-<link href="resources/grid.css" rel="stylesheet">
-<link href="resources/grid-alignment.css" rel="stylesheet">
-<script src="../../resources/check-layout.js"></script>
-<style>
-body {
-    margin: 0;
-}
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-self and justify-self with auto margins, vertical-rl</title>
+<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-items">
+<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.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 
+<style>
 .grid {
     grid-template-columns: 100px 100px;
     grid-template-rows: 200px 200px;
@@ -27,12 +29,16 @@ body {
 .autoMarginLeft { margin-left: auto; }
 .autoMargin { margin: auto; }
 </style>
-</head>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
 <body onload="checkLayout('.grid')">
 
-<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>
+<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>
 
-<p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
+<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL itemsCenter">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="60" data-expected-width="20" data-expected-height="40"></div>
@@ -42,7 +48,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
+<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"></div>
@@ -52,7 +58,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
+<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL itemsCenter">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="60" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -62,7 +68,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
+<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="30" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -73,7 +79,7 @@ body {
 </div>
 
 <!-- direction RTL -->
-<p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
+<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL itemsCenter directionRTL">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
@@ -84,7 +90,7 @@ body {
 </div>
 
 
-<p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
+<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL directionRTL">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"></div>
@@ -94,7 +100,7 @@ body {
     </div>
 </div>
 
-<p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
+<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content verticalRL itemsCenter directionRTL">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="290" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -105,7 +111,7 @@ body {
 </div>
 
 
-<p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
+<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid verticalRL directionRTL" data-expected-width="400" data-expected-height="200">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="290" data-offset-y="130" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -115,5 +121,4 @@ body {
     </div>
 </div>
 
-</body>
-</html>
+</body>
\ No newline at end of file
@@ -1,15 +1,17 @@
 <!DOCTYPE html>
-<html>
-<head>
-<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
-<link href="resources/grid.css" rel="stylesheet">
-<link href="resources/grid-alignment.css" rel="stylesheet">
-<script src="../../resources/check-layout.js"></script>
-<style>
-body {
-    margin: 0;
-}
+<meta charset="utf-8">
+<title>CSS Grid Layout test: align-self and justify-self with auto margins</title>
+<link rel="author" title="Rossana Monteriso" href="mailto:rmonteriso@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid/#auto-margins">
+<link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-align-items">
+<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.">
+<meta name="flags" content="ahem">
+<link rel="stylesheet" href="/css/support/grid.css">
+<link rel="stylesheet" href="/css/support/alignment.css">
+<link rel="stylesheet" href="/css/support/width-keyword-classes.css">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 
+<style>
 .grid {
     grid-template-columns: 100px 100px;
     grid-template-rows: 200px 200px;
@@ -27,12 +29,16 @@ body {
 .autoMarginLeft { margin-left: auto; }
 .autoMargin { margin: auto; }
 </style>
-</head>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+
 <body onload="checkLayout('.grid')">
 
-<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>
+<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>
 
-<p>Direction: LTR | Self Aligmment: center | fixed size items | 1 auto-margin</p>
+<p>Direction: LTR | Self Alignment: center | fixed size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content itemsCenter">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="40" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
@@ -42,7 +48,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: start | fixed size items | 4 auto-margin</p>
+<p>Direction: LTR | Self Alignment: start | fixed size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
@@ -52,7 +58,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: center | auto size items | 1 auto-margin</p>
+<p>Direction: LTR | Self Alignment: center | auto size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content itemsCenter">
         <div class="autoMarginTop firstRowFirstColumn" data-offset-x="40" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -62,7 +68,7 @@ body {
     </div>
 </div>
 
-<p>Direction: LTR | Self Aligmment: start | auto size items | 4 auto-margin</p>
+<p>Direction: LTR | Self Alignment: start | auto size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content">
         <div class="autoMargin firstRowFirstColumn" data-offset-x="40" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -73,7 +79,7 @@ body {
 </div>
 
 <!-- direction RTL -->
-<p>Direction: RTL | Self Aligmment: center | fixed size items | 1 auto-margin</p>
+<p>Direction: RTL | Self Alignment: center | fixed size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content itemsCenter directionRTL">
         <div class="item autoMarginTop firstRowFirstColumn" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"></div>
@@ -83,7 +89,7 @@ body {
     </div>
 </div>
 
-<p>Direction: RTL | Self Aligmment: start | fixed size items | 4 auto-margin</p>
+<p>Direction: RTL | Self Alignment: start | fixed size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content directionRTL">
         <div class="item autoMargin firstRowFirstColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"></div>
@@ -93,7 +99,7 @@ body {
     </div>
 </div>
 
-<p>Direction: RTL | Self Aligmment: center | auto size items | 1 auto-margin</p>
+<p>Direction: RTL | Self Alignment: center | auto size items | 1 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content itemsCenter directionRTL">
         <div class="autoMarginTop firstRowFirstColumn" data-offset-x="140" data-offset-y="160" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -103,7 +109,7 @@ body {
     </div>
 </div>
 
-<p>Direction: RTL | Self Aligmment: start | auto size items | 4 auto-margin</p>
+<p>Direction: RTL | Self Alignment: start | auto size items | 4 auto-margin</p>
 <div style="position: relative">
     <div class="grid fit-content directionRTL">
         <div class="autoMargin firstRowFirstColumn" data-offset-x="140" data-offset-y="80" data-expected-width="20" data-expected-height="40"><div class="item"></div></div>
@@ -113,5 +119,4 @@ body {
     </div>
 </div>
 
-</body>
-</html>
+</body>
\ No newline at end of file