Move build folder's resources location and update paths

w3c · Aug 27, 2024 · 37af6f5 · 37af6f5
1 parent e10ab4b
commit 37af6f5
Show file tree

Hide file tree

Showing 7 changed files with 269 additions and 271 deletions.
diff --git a/__test__/__snapshots__/createAllTests.test.js.snap b/__test__/__snapshots__/createAllTests.test.js.snap
diff --git a/__test__/__snapshots__/createReviewPages.test.js.snap b/__test__/__snapshots__/createReviewPages.test.js.snap
@@ -113,7 +113,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -570,7 +570,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -3542,7 +3542,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -4664,7 +4664,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -7251,7 +7251,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -7708,7 +7708,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -10680,7 +10680,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -11802,7 +11802,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -14389,7 +14389,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -14846,7 +14846,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -17818,7 +17818,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -18940,7 +18940,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -21527,7 +21527,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -21984,7 +21984,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -24956,7 +24956,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -26078,7 +26078,7 @@ exports[`review pages creation runs createReviewPages successfully for all test
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -28638,7 +28638,7 @@ exports[`review pages creation runs createReviewPages successfully for v1 tests
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -31653,7 +31653,7 @@ exports[`review pages creation runs createReviewPages successfully for v2 tests
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -32136,7 +32136,7 @@ exports[`review pages creation runs createReviewPages successfully for v2 tests
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;
@@ -33290,7 +33290,7 @@ exports[`review pages creation runs createReviewPages successfully for v2 tests
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;

diff --git a/lib/data/process-test-directory-v1.js b/lib/data/process-test-directory-v1.js
@@ -112,9 +112,9 @@ const processTestDirectory = async config => {
       'tests',
       `tests/${testPlanName}`,
       `tests/${testPlanName}/**`,
+      'tests/support.json',
       'resources',
       'resources/*',
-      'tests/support.json',
     ].join(','),
   });
 
@@ -148,10 +148,10 @@ const processTestDirectory = async config => {
             name: testPlanName,
             entries: testPlanUpdate.filter({ glob: 'reference{,/**}' }).record.entries,
           },
-          { name: 'resources', ...resourcesRecord.record },
           { name: 'support.json', ...supportRecord.record },
         ],
       },
+      { name: 'resources', ...resourcesRecord.record },
     ],
   });
 
@@ -457,7 +457,7 @@ ${references}
   ${getScripts()}
 </script>
 <script type="module">
-  import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
+  import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../../resources/aria-at-harness.mjs";
 
   new Promise((resolve) => {
     fetch('../support.json')

diff --git a/lib/data/process-test-directory.js b/lib/data/process-test-directory.js
@@ -108,10 +108,10 @@ const processTestDirectory = async config => {
       'tests',
       `tests/${testPlanName}`,
       `tests/${testPlanName}/**`,
+      'tests/commands.json',
+      'tests/support.json',
       'resources',
       'resources/*',
-      'tests/support.json',
-      'tests/commands.json',
     ].join(','),
   });
 
@@ -146,11 +146,11 @@ const processTestDirectory = async config => {
             name: testPlanName,
             entries: testPlanUpdate.filter({ glob: 'reference{,/**}' }).record.entries,
           },
-          { name: 'resources', ...resourcesRecord.record },
           { name: 'support.json', ...supportJsonRecord.record },
           { name: 'commands.json', ...commandsJsonRecord.record },
         ],
       },
+      { name: 'resources', ...resourcesRecord.record },
     ],
   });
 
@@ -574,7 +574,7 @@ ${exampleReferences}
   ${getScripts()}
 </script>
 <script type="module">
-  import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../resources/aria-at-harness.mjs";
+  import { initialize, verifyATBehavior, displayTestPageAndInstructions } from "../../resources/aria-at-harness.mjs";
 
   new Promise((resolve) => {
     fetch('../support.json')

diff --git a/lib/data/templates/collected-test.html.js b/lib/data/templates/collected-test.html.js
@@ -91,7 +91,7 @@ function renderHTML(test, testFileName) {
   </head>
   <body>
     <script type="module">
-      import {loadCollectedTestAsync} from "../resources/aria-at-harness.mjs";
+      import {loadCollectedTestAsync} from "../../resources/aria-at-harness.mjs";
       loadCollectedTestAsync(new URL(location + "/..").pathname, "${testFileName}");
     </script>
   </body>

diff --git a/scripts/test-reviewer/createReviewPages.mjs b/scripts/test-reviewer/createReviewPages.mjs
@@ -63,8 +63,6 @@ export function createReviewPages(config) {
   const allATKeys = support.ats.map(at => at.key);
 
   fse.readdirSync(testsBuildDirectory).forEach(function (directory) {
-    if (directory === 'resources') return;
-
     const testPlanDirectory = path.join(testsDirectory, directory);
     const stat = fse.statSync(testPlanDirectory);
 

diff --git a/scripts/test-reviewer/review-template.mustache b/scripts/test-reviewer/review-template.mustache
@@ -19,7 +19,7 @@
 
     </style>
     <script type="module">
-      import {TestWindow} from '../../tests/resources/aria-at-test-window.mjs';
+      import {TestWindow} from '../../resources/aria-at-test-window.mjs';
 
       function numberTests(value) {
         let testNumber = 0;