Fixup tests for better safari compat

marcoscaceres · marcoscaceres · commit 9c2bda946fe7 · 2021-03-29T17:19:55.000+11:00
diff --git a/tests/spec/core/highlight-spec.js b/tests/spec/core/highlight-spec.js
@@ -12,7 +12,7 @@ describe("Core — Highlight", () => {
   afterAll(flushIframes);
 
   it("highlights remote languages not bundled by default with ReSpec", async () => {
-    const doc = await makeRSDoc({}, "spec/core/highlight.html");
+    const doc = await makeRSDoc(null, "spec/core/highlight.html");
     const span = doc.querySelector("code.testlang span[class*=hljs]");
     expect(span.textContent).toBe("funkyFunction");
   });
diff --git a/tests/spec/core/highlight.html b/tests/spec/core/highlight.html
@@ -2,10 +2,9 @@
 <html>
   <head>
     <meta charset='utf-8'>
-    <title>Replace me with a real title</title>
-    <script class='remove' src='/builds/respec-w3c.js'></script>
+    <title>Highlight tester</title>
     <script class='remove'>
-      async function loadSolidity() {
+      async function loadHighlighter() {
         const worker = await new Promise(resolve => {
           require(["core/worker"], ({ worker }) => resolve(worker));
         });
@@ -25,8 +24,8 @@
         });
       }
       var respecConfig = {
-        preProcess: [loadSolidity],
-        specStatus: "ED",
+        preProcess: [loadHighlighter],
+        specStatus: "base",
         editors: [
           {
             name: "Your Name",
@@ -39,14 +38,6 @@
   </head>
   <body>
     <section id='abstract'>
-      <p>
-        This is required.
-      </p>
-    </section>
-    <section id='sotd'>
-      <p>
-        This is required.
-      </p>
       <pre class="example testlang">
         funkyFunction
       </pre>
diff --git a/tests/spec/core/seo-spec.js b/tests/spec/core/seo-spec.js
@@ -16,18 +16,10 @@ describe("Core — Seo", () => {
       body: makeDefaultBody(),
     };
     const doc = await makeRSDoc(ops);
-    await doc.respec.ready;
-    await new Promise(resolve => {
-      const check = () => {
-        const hasMetaDesc = doc.querySelectorAll("meta[name=description]");
-        expect(hasMetaDesc).toHaveSize(0);
-        resolve();
-      };
-      window.requestIdleCallback ? window.requestIdleCallback(check) : check();
-    });
+    expect(doc.querySelectorAll("meta[name=description]")).toHaveSize(0);
   });
 
-  it("inserts a meta element for the description after processing", async () => {
+  it("inserts a meta element for the description", async () => {
     const ops = {
       config: makeBasicConfig(),
       abstract: `<p>
@@ -37,24 +29,9 @@ describe("Core — Seo", () => {
       body: makeDefaultBody(),
     };
     const doc = await makeRSDoc(ops);
-    await doc.respec.ready;
-    await new Promise(resolve => {
-      const check = () => {
-        const hasMetaDesc = doc.querySelectorAll("meta[name=description]")
-          .length;
-        // Firefox is buggy, short circuit
-        if (navigator.userAgent.includes("Firefox") && !hasMetaDesc) {
-          expect(true).toBe(true);
-          return;
-        }
-        expect(hasMetaDesc).toBe(1);
-        const meta = doc.head.querySelector("meta[name=description]");
-        expect(meta.content).toBe("Pass");
-        resolve();
-      };
-      window.requestIdleCallback
-        ? doc.defaultView.requestIdleCallback(check)
-        : check();
-    });
+    const metaTags = doc.querySelectorAll("meta[name=description]");
+    expect(metaTags).toHaveSize(1);
+    const meta = doc.head.querySelector("meta[name=description]");
+    expect(meta.content).toBe("Pass");
   });
 });
