From 235abce9391caa1a8362c9d3cd7c43c30c9d171d Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 17 Jan 2018 21:55:59 +0100
Subject: [PATCH] [css-grid] Fix grid-alignment-implies-size-change tests

This should fix w3c/csswg-drafts#2194 as it's moving the style-change.js script
under css/css-grid/alignment/support/ folder.

On top of that it's fixing those tests as the second checkLayout() call
was never checked.
This was because by default checkLayout() calls done(), and the test thinks
it has already finished.
Modified the call to checkLayout() in the script style-change.js
and calling manually done() in the tests fixes the problem.
---
 .../alignment/grid-alignment-implies-size-change-001.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-002.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-003.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-004.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-005.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-006.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-007.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-008.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-009.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-010.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-011.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-012.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-013.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-014.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-015.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-016.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-017.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-018.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-019.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-020.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-021.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-022.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-023.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-024.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-025.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-026.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-027.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-028.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-029.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-030.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-031.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-032.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-033.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-034.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-035.html      | 3 ++-
 .../alignment/grid-alignment-implies-size-change-036.html      | 3 ++-
 css/css-grid/{ => alignment}/support/style-change.js           | 2 +-
 37 files changed, 73 insertions(+), 37 deletions(-)
 rename css/css-grid/{ => alignment}/support/style-change.js (83%)

diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-001.html b/css/css-grid/alignment/grid-alignment-implies-size-change-001.html
index c5c2cf50cecb1d..2dec3c769a5ae9 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-001.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-001.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 200);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-002.html b/css/css-grid/alignment/grid-alignment-implies-size-change-002.html
index f0dc1530aee59a..4463ebf121f789 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-002.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-002.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-height", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-003.html b/css/css-grid/alignment/grid-alignment-implies-size-change-003.html
index 3ae1ba1363829c..f9e1c873fbdd72 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-003.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-003.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 200);
   grid.style.alignItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-height", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-004.html b/css/css-grid/alignment/grid-alignment-implies-size-change-004.html
index 12ca38d60784f6..ab532206f6ac98 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-004.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-004.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 200);
   grid.style.alignItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-height", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-005.html b/css/css-grid/alignment/grid-alignment-implies-size-change-005.html
index e76a1525d59c61..3002c174e84b8a 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-005.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-005.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-height", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-006.html b/css/css-grid/alignment/grid-alignment-implies-size-change-006.html
index 662260131fe66b..cf44e9f57b4413 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-006.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-006.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 200);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-007.html b/css/css-grid/alignment/grid-alignment-implies-size-change-007.html
index 300ace54588911..f8aa2da3fd22b2 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-007.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-007.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-height", 80);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-008.html b/css/css-grid/alignment/grid-alignment-implies-size-change-008.html
index e3a8b47031bbeb..24af744b95a3b5 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-008.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-008.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 80);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-009.html b/css/css-grid/alignment/grid-alignment-implies-size-change-009.html
index 3f7d675b9ce0aa..bb33c4a2c2ce75 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-009.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-009.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-height", 80);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-010.html b/css/css-grid/alignment/grid-alignment-implies-size-change-010.html
index fc284b015a7ebf..876fdcd124d5c3 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-010.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-010.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 80);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-011.html b/css/css-grid/alignment/grid-alignment-implies-size-change-011.html
index 1367dd4d7070ae..ff184f16174536 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-011.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-011.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 200);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-012.html b/css/css-grid/alignment/grid-alignment-implies-size-change-012.html
index cebc217f9b47a5..b9a9d9b43d334c 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-012.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-012.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-height", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-013.html b/css/css-grid/alignment/grid-alignment-implies-size-change-013.html
index b606c03be41556..356220b336b856 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-013.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-013.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 200);
   grid.style.alignItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-014.html b/css/css-grid/alignment/grid-alignment-implies-size-change-014.html
index 61d6365c7d3825..3561ae3d80fb51 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-014.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-014.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-height", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-015.html b/css/css-grid/alignment/grid-alignment-implies-size-change-015.html
index b264e36cd315ad..c56c1397553327 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-015.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-015.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-016.html b/css/css-grid/alignment/grid-alignment-implies-size-change-016.html
index 86d5226946a4ba..7815a05718f063 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-016.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-016.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-017.html b/css/css-grid/alignment/grid-alignment-implies-size-change-017.html
index 543bd0af941201..c8a2ed8b2cc703 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-017.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-017.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 100);
   grid.style.alignItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-height", 80);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-018.html b/css/css-grid/alignment/grid-alignment-implies-size-change-018.html
index 33aaa6bf29ec34..547e6a42984d50 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-018.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-018.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-height", 80);
   grid.style.alignItems = "start";
   evaluateStyleChange(item, "after", "data-expected-height", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-019.html b/css/css-grid/alignment/grid-alignment-implies-size-change-019.html
index c98144c6e3d313..53139cbe585aae 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-019.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-019.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 200);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 120);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-020.html b/css/css-grid/alignment/grid-alignment-implies-size-change-020.html
index d2fab3207636e5..0b6a26f11d6f7e 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-020.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-020.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 120);
   grid.style.justifyItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-width", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-021.html b/css/css-grid/alignment/grid-alignment-implies-size-change-021.html
index 1a40142f49fedc..7b68964227fbbf 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-021.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-021.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 200);
   grid.style.alignItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-width", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-022.html b/css/css-grid/alignment/grid-alignment-implies-size-change-022.html
index 3ea469befdd02e..e4f9e7c3a2db8f 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-022.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-022.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 200);
   grid.style.justifyItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-width", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-023.html b/css/css-grid/alignment/grid-alignment-implies-size-change-023.html
index e78986de53f4f3..a1bfe9c067330f 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-023.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-023.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 120);
   grid.style.justifyItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-width", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-024.html b/css/css-grid/alignment/grid-alignment-implies-size-change-024.html
index 9f6c49c16b67ff..6d3136e00c67d7 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-024.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-024.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 200);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 120);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-025.html b/css/css-grid/alignment/grid-alignment-implies-size-change-025.html
index 471c2ef1148a4e..917d1109a457c6 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-025.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-025.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 120);
   grid.style.justifyItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-width", 80);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-026.html b/css/css-grid/alignment/grid-alignment-implies-size-change-026.html
index facad8a4d28ed2..382ef2523e28d1 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-026.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-026.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 80);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 120);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-027.html b/css/css-grid/alignment/grid-alignment-implies-size-change-027.html
index dc9c092797b5b7..0bdedf74dcfec5 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-027.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-027.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 120);
   grid.style.justifyItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-width", 80);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-028.html b/css/css-grid/alignment/grid-alignment-implies-size-change-028.html
index 870538a332fda7..0def10e2b6e4f8 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-028.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-028.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 80);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 120);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-029.html b/css/css-grid/alignment/grid-alignment-implies-size-change-029.html
index cb067b652c775e..766db6baa37a6f 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-029.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-029.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 200);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-030.html b/css/css-grid/alignment/grid-alignment-implies-size-change-030.html
index c7033bb6b8fe5c..3db3b8319f0c93 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-030.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-030.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 100);
   grid.style.justifyItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-width", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-031.html b/css/css-grid/alignment/grid-alignment-implies-size-change-031.html
index 55bffbe1c6c47a..7b0c26d644d1ae 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-031.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-031.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 200);
   grid.style.justifyItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-width", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-032.html b/css/css-grid/alignment/grid-alignment-implies-size-change-032.html
index 006cb6a6a95009..d161e19b018be7 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-032.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-032.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 100);
   grid.style.justifyItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-width", 200);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-033.html b/css/css-grid/alignment/grid-alignment-implies-size-change-033.html
index 157f43bbac9cd9..92a745618896ba 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-033.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-033.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 100);
   grid.style.justifyItems = "normal";
   evaluateStyleChange(item, "after", "data-expected-width", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-034.html b/css/css-grid/alignment/grid-alignment-implies-size-change-034.html
index 6dbd653c0674ca..78314406fe3c74 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-034.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-034.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 100);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-035.html b/css/css-grid/alignment/grid-alignment-implies-size-change-035.html
index fbd8e6f87736aa..4293670f1995c3 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-035.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-035.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 100);
   grid.style.justifyItems = "stretch";
   evaluateStyleChange(item, "after", "data-expected-width", 80);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/alignment/grid-alignment-implies-size-change-036.html b/css/css-grid/alignment/grid-alignment-implies-size-change-036.html
index 018b13c95dde84..23b01906619bb1 100644
--- a/css/css-grid/alignment/grid-alignment-implies-size-change-036.html
+++ b/css/css-grid/alignment/grid-alignment-implies-size-change-036.html
@@ -26,12 +26,13 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/check-layout-th.js"></script>
-<script src="../support/style-change.js"></script>
+<script src="support/style-change.js"></script>
 <script>
 function runTest() {
   evaluateStyleChange(item, "before", "data-expected-width", 80);
   grid.style.justifyItems = "start";
   evaluateStyleChange(item, "after", "data-expected-width", 100);
+  done();
 }
 </script>
 <body onload="runTest()">
diff --git a/css/css-grid/support/style-change.js b/css/css-grid/alignment/support/style-change.js
similarity index 83%
rename from css/css-grid/support/style-change.js
rename to css/css-grid/alignment/support/style-change.js
index 636b08a3a010d1..5619394da2bc9c 100644
--- a/css/css-grid/support/style-change.js
+++ b/css/css-grid/alignment/support/style-change.js
@@ -1,5 +1,5 @@
 function evaluateStyleChange(element, phase, expectedProperty, expectedResult) {
     element.className += " " + phase;
     element.setAttribute(expectedProperty, expectedResult);
-    checkLayout("." + phase);
+    checkLayout("." + phase, false);
 }