clean up injected js and try more gpu info

greggman · Jul 2, 2024 · ca51657 · ca51657
1 parent ef736f4
commit ca51657
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/test/puppeteer.js b/test/puppeteer.js
@@ -75,9 +75,9 @@ async function test(port) {
   for (const {url, js, screenshot} of testPages) {
     waitingPromiseInfo = makePromiseInfo();
     console.log(`===== [ ${url} ] =====`);
-    if (js) {
-      await page.evaluateOnNewDocument(js);
-    }
+    const id = js
+      ? await page.evaluateOnNewDocument(js)
+      : undefined;
     await page.goto(url);
     await page.waitForNetworkIdle();
     if (js) {
@@ -95,6 +95,9 @@ async function test(port) {
       const path = `${dir}/${name}.png`;
       await page.screenshot({path});
     }
+    if (js) {
+      await page.removeScriptToEvaluateOnNewDocument(id.identifier);
+    }
   }
 
   await browser.close();

diff --git a/test/tests/gpu-info.js b/test/tests/gpu-info.js
@@ -10,7 +10,7 @@ function objLikeToObj(objLike) {
 
 export async function getInfo() {
   const adapter = await navigator.gpu.requestAdapter();
-  const info = adapter?.info ?? await adapter?.requestAdapterInfo() ?? {};
+  const info = adapter?.info || await adapter?.requestAdapterInfo() || {error: 'no info'};
   const title = JSON.stringify(objLikeToObj(info), null, 2);
 
   describe('gpu info', () => {