Restructure more tests

Author: dontcallmedom

test/elements/consistency.js

@@ -1,12 +1,12 @@
 /**
  * Test the consistency of elements extracts with IDL extracts.
- * 
+ *
  * The tests run against the curated and package views of the data. An extract
  * that passes a test in the curated view may fail the same test in the package
  * view because of some missing IDL definition in that view.
  */
 
-import { describe, it, before } from 'node:test';
+import { describe, it } from 'node:test';
 import { strict as assert } from 'node:assert';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -26,37 +26,36 @@ const views = [
 ];
 
 views.forEach(({ name, folder }) => {
-  describe(`The ${name} view of elements extracts`, () => {
-    before(async () => {
-      // Create a set of well-known interfaces
-      const allIdl = await idl.parseAll({ folder: path.join(folder, 'idl') });
-      const interfaces = new Set();
-      for (const [shortname, ast] of Object.entries(allIdl)) {
-        for (const dfn of ast) {
-          if (dfn.name) {
-            interfaces.add(dfn.name);
-          }
+  describe(`The ${name} view of elements extracts`, async () => {
+    let allIdl;
+    try {
+      allIdl = await idl.parseAll({ folder: path.join(folder, 'idl') });
+    } catch (err) {
+      it('contains valid JSON data', () => {throw err;});
+    }
+    const interfaces = new Set();
+    for (const [shortname, ast] of Object.entries(allIdl)) {
+      for (const dfn of ast) {
+        if (dfn.name) {
+          interfaces.add(dfn.name);
         }
       }
+    }
 
-      const allElements = await elements.listAll({ folder: path.join(folder, 'elements') });
-      for (const [shortname, data] of Object.entries(allElements)) {
-        describe(`The elements extract for ${shortname} in the ${name} view`, () => {
-          for (const el of data.elements) {
-            if (!el.interface) {
-              continue;
-            }
-            it(`links to a well-known interface for "${el.name}"`, () => {
-              assert(interfaces.has(el.interface), `Unknown interface "${el.interface}"`);
-            });
+    const allElements = await elements.listAll({ folder: path.join(folder, 'elements') });
+    for (const [shortname, data] of Object.entries(allElements)) {
+      describe(`The elements extract for ${shortname} in the ${name} view`, () => {
+        for (const el of data.elements) {
+          if (!el.interface) {
+            continue;
           }
-        });
-      }
-    });
-
-    // Dummy test needed for "before" to run and register late tests
-    // (test will fail if before function throws, e.g. because data is invalid)
-    it('contains valid JSON data', () => {});
+          it(`links to a well-known interface for "${el.name}"`, () => {
+            assert(interfaces.has(el.interface), `Unknown interface "${el.interface}"`);
+          });
+        }
+      });
+    }
   });
+
 });
 

test/events/all.js

@@ -1,13 +1,13 @@
 /**
  * Test individual events extracts.
- * 
+ *
  * The tests run against the curated view of the extracts.
- * 
+ *
  * Note: the tests are not run against the `@webref/events` package view of
  * the data because that view is a strict subset of the curated view.
  */
 
-import { describe, it, before } from 'node:test';
+import { describe, it } from 'node:test';
 import { strict as assert } from 'node:assert';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -30,9 +30,14 @@ function report(msg, event) {
     (event.href ? ` href=${event.href}` : '');
 }
 
-before(async () => {
+describe("the events data", async () => {
   // Create a set of well-known interfaces and an inheritance chain
-  const allIdl = await idl.parseAll({ folder: path.join(curatedFolder, 'idl') });
+  let allIdl;
+  try {
+    allIdl = await idl.parseAll({ folder: path.join(curatedFolder, 'idl') });
+  } catch (err) {
+      it('contains data that can be parsed with webidl2.js', () => {throw err;});
+  }
   const parsedInterfaces = [];
   const mixins = new Set();
   for (const [shortname, ast] of Object.entries(allIdl)) {