test: fix

Author: alexander-akait

test/e2e/api.test.js

@@ -257,7 +257,8 @@ describe("API", () => {
 
       await server.start();
 
-      const secondPage = await browser.newPage();
+      const secondPage = await runBrowser.runPage(browser);
+
       try {
         const secondPageErrors = [];
         const secondConsoleMessages = [];

test/e2e/static-public-path.test.js

@@ -672,8 +672,6 @@ describe("static.publicPath option", () => {
     });
 
     it("should handle HEAD request", async () => {
-      await page.setRequestInterception(true);
-
       page
         .on("console", (message) => {
           consoleMessages.push(message);
@@ -682,6 +680,8 @@ describe("static.publicPath option", () => {
           pageErrors.push(error);
         })
         .on("request", (interceptedRequest) => {
+          if (interceptedRequest.isInterceptResolutionHandled()) return;
+
           interceptedRequest.continue({ method: "HEAD" });
         });
 

test/helpers/run-browser.js

@@ -14,15 +14,6 @@ const { puppeteerArgs } = require("./puppeteer-constants");
  * @returns {Promise<RunBrowserResult>}
  */
 function runBrowser(config) {
-  const options = {
-    viewport: {
-      width: 500,
-      height: 500,
-    },
-    userAgent: "",
-    ...config,
-  };
-
   return new Promise((resolve, reject) => {
     /**
      * @type {import('puppeteer').Page}
@@ -44,35 +35,60 @@ function runBrowser(config) {
       .then((launchedBrowser) => {
         browser = launchedBrowser;
 
-        return browser.newPage();
+        return runPage(launchedBrowser, config);
       })
       .then((newPage) => {
         page = newPage;
-        page.emulate(options);
-
-        return page.setRequestInterception(true);
-      })
-      .then(() => {
-        page.on("request", (interceptedRequest) => {
-          if (interceptedRequest.isInterceptResolutionHandled()) return;
-          if (interceptedRequest.url().includes("favicon.ico")) {
-            interceptedRequest.respond({
-              status: 200,
-              contentType: "image/png",
-              body: "Empty",
-            });
-          } else {
-            interceptedRequest.continue(
-              interceptedRequest.continueRequestOverrides(),
-              10,
-            );
-          }
-        });
 
         resolve({ page, browser });
       })
       .catch(reject);
   });
 }
 
+function runPage(browser, config) {
+  /**
+   * @type {import('puppeteer').Page}
+   */
+  let page;
+
+  const options = {
+    viewport: {
+      width: 500,
+      height: 500,
+    },
+    userAgent: "",
+    ...config,
+  };
+
+  return Promise.resolve()
+    .then(() => browser.newPage())
+    .then((newPage) => {
+      page = newPage;
+      page.emulate(options);
+
+      return page.setRequestInterception(true);
+    })
+    .then(() => {
+      page.on("request", (interceptedRequest) => {
+        if (interceptedRequest.isInterceptResolutionHandled()) return;
+        if (interceptedRequest.url().includes("favicon.ico")) {
+          interceptedRequest.respond({
+            status: 200,
+            contentType: "image/png",
+            body: "Empty",
+          });
+        } else {
+          interceptedRequest.continue(
+            interceptedRequest.continueRequestOverrides(),
+            10,
+          );
+        }
+      });
+
+      return page;
+    });
+}
+
 module.exports = runBrowser;
+module.exports.runPage = runPage;