Adjust syntax of text-spacing[-trim] to match CSSWG resolution

See w3c/csswg-drafts#9511
web-platform-tests · Dec 21, 2023 · 028df8b · 028df8b
1 parent 8ac73b1
commit 028df8b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/css/css-text/parsing/text-spacing-computed.html b/css/css-text/parsing/text-spacing-computed.html
@@ -19,17 +19,14 @@
 test_computed_value("text-spacing", "no-autospace");
 
 // `text-spacing-trim`.
-test_computed_value("text-spacing", "space-first", "normal");
+test_computed_value("text-spacing", "trim-start");
 test_computed_value("text-spacing", "space-all");
-// Two values syntax.
-test_computed_value("text-spacing", "allow-end space-first");
-test_computed_value("text-spacing", "space-first allow-end", "allow-end space-first");
 
 // `text-autospace` and `text-spacing-trim`.
-test_computed_value("text-spacing", "no-autospace space-first", "no-autospace");
+test_computed_value("text-spacing", "no-autospace normal", "no-autospace");
 test_computed_value("text-spacing", "no-autospace space-all", "none");
 // Test the reversed order.
-test_computed_value("text-spacing", "space-first no-autospace", "no-autospace");
+test_computed_value("text-spacing", "normal no-autospace", "no-autospace");
 test_computed_value("text-spacing", "space-all no-autospace", "none");
 </script>
 </body>

diff --git a/css/css-text/parsing/text-spacing-invalid.html b/css/css-text/parsing/text-spacing-invalid.html
@@ -11,7 +11,7 @@
 <body>
 <script>
 // These keywords must appear alone.
-for (const keyword of ['normal', 'none', 'auto']) {
+for (const keyword of ['none', 'auto']) {
   test_invalid_value("text-spacing", `${keyword} ${keyword}`);
   for (const keyword2 of ['no-autospace', 'space-first']) {
     test_invalid_value("text-spacing", `${keyword} ${keyword2}`);

diff --git a/css/css-text/parsing/text-spacing-trim-computed.html b/css/css-text/parsing/text-spacing-trim-computed.html
@@ -12,14 +12,12 @@
 <div id="target"></div>
 <script>
 test_computed_value("text-spacing-trim", "auto");
+test_computed_value("text-spacing-trim", "normal");
 test_computed_value("text-spacing-trim", "space-all");
 test_computed_value("text-spacing-trim", "trim-auto");
 test_computed_value("text-spacing-trim", "trim-all");
-test_computed_value("text-spacing-trim", "allow-end");
+test_computed_value("text-spacing-trim", "trim-start");
 test_computed_value("text-spacing-trim", "space-first");
-
-test_computed_value("text-spacing-trim", "allow-end space-first");
-test_computed_value("text-spacing-trim", "space-first allow-end", "allow-end space-first");
 </script>
 </body>
 </html>
diff --git a/css/css-text/parsing/text-spacing-trim-invalid.html b/css/css-text/parsing/text-spacing-trim-invalid.html
@@ -10,11 +10,14 @@
 </head>
 <body>
 <script>
-test_invalid_value("text-spacing-trim", "normal");
+test_invalid_value("text-spacing-trim", "none");
 test_invalid_value("text-spacing-trim", "normal space-all");
 test_invalid_value("text-spacing-trim", "normal space-first");
 test_invalid_value("text-spacing-trim", "auto space-all");
 test_invalid_value("text-spacing-trim", "auto space-first");
+test_invalid_value("text-spacing-trim", "allow-end");
+test_invalid_value("text-spacing-trim", "allow-end space-first");
+test_invalid_value("text-spacing-trim", "space-first allow-end");
 </script>
 </body>
 </html>
diff --git a/css/css-text/parsing/text-spacing-trim-valid.html b/css/css-text/parsing/text-spacing-trim-valid.html
@@ -10,15 +10,13 @@
 </head>
 <body>
 <script>
+test_valid_value("text-spacing-trim", "normal");
 test_valid_value("text-spacing-trim", "auto");
 test_valid_value("text-spacing-trim", "space-all");
 test_valid_value("text-spacing-trim", "trim-auto");
 test_valid_value("text-spacing-trim", "trim-all");
-test_valid_value("text-spacing-trim", "allow-end");
+test_valid_value("text-spacing-trim", "trim-start");
 test_valid_value("text-spacing-trim", "space-first");
-
-test_valid_value("text-spacing-trim", "allow-end space-first");
-test_valid_value("text-spacing-trim", "space-first allow-end");
 </script>
 </body>
 </html>
diff --git a/css/css-text/parsing/text-spacing-valid.html b/css/css-text/parsing/text-spacing-valid.html
@@ -18,17 +18,14 @@
 test_valid_value("text-spacing", "no-autospace");
 
 // `text-spacing-trim`.
-test_valid_value("text-spacing", "space-first", "normal");
+test_valid_value("text-spacing", "trim-start");
 test_valid_value("text-spacing", "space-all");
-// Two values syntax.
-test_valid_value("text-spacing", "allow-end space-first");
-test_valid_value("text-spacing", "space-first allow-end", "allow-end space-first");
 
 // `text-autospace` and `text-spacing-trim`.
-test_valid_value("text-spacing", "no-autospace space-first", "no-autospace");
+test_valid_value("text-spacing", "no-autospace normal", "no-autospace");
 test_valid_value("text-spacing", "no-autospace space-all", "none");
 // Test the reversed order.
-test_valid_value("text-spacing", "space-first no-autospace", "no-autospace");
+test_valid_value("text-spacing", "normal no-autospace", "no-autospace");
 test_valid_value("text-spacing", "space-all no-autospace", "none");
 </script>
 </body>