@eyeo/get-browser-binary 0.8.0 → 0.10.0

package/.gitlab-ci.yml

@@ -32,12 +32,10 @@ test:browsers:linux:
   image: docker:20.10.16
   services:
     - docker:20.10.16-dind
-  variables:
-    DOCKER_DRIVER: overlay2
   before_script:
     - docker build -f test/docker/Dockerfile -t browsers .
   script:
-    - docker run --shm-size=256m browsers
+    - docker run --shm-size=512m -t browsers
 
 test:browsers:windows:
   stage: test
@@ -53,15 +51,13 @@ test:browsers:windows:
     - choco upgrade -y nodejs --version 16.10.0
     - npm install
   script:
+    # Running Edge tests only on the preinstalled version
+    # https://gitlab.com/eyeo/developer-experience/get-browser-binary/-/issues/29
+    - npm test -- --grep "edge.*latest"
+    - npm test -- --grep "chromium"
     # Running only a subset of Firefox tests to avoid low OS resources error
     # https://gitlab.com/eyeo/developer-experience/get-browser-binary/-/issues/2
     - npm test -- --grep "firefox.*installs"
-    # Running npm v8 on powershell has issues when the grep value contains the
-    # pipe (|) literal. Storing that string as a verbatim string (single quotes)
-    # and then sorrounding it with four double quotes does the trick.
-    # https://gitlab.com/eyeo/developer-experience/get-browser-binary/-/issues/29
-    - $full_tests = '(chromium|edge.*latest)'
-    - npm test -- --grep """"$full_tests""""
   tags:
     - shared-windows
     - windows

package/.mocharc.json

@@ -1,3 +1,3 @@
 {
-  "timeout": 50000
+  "timeout": 80000
 }

package/README.md

@@ -88,14 +88,14 @@ Useful to reproduce the CI environment of the `test:browsers:linux` job:
 
 ```shell
 docker build -f test/docker/Dockerfile -t browsers .
-docker run --shm-size=256m -it browsers
+docker run --shm-size=512m -it browsers
 ```
 
 The `grep` and `timeout` options can also be used on Docker via the `TEST_ARGS`
 parameter:
 
 ```shell
-docker run --shm-size=256m -e TEST_ARGS="--grep chromium.*latest --timeout 100000" -it browsers
+docker run --shm-size=512m -e TEST_ARGS="--grep chromium.*latest --timeout 100000" -it browsers
 ```
 
 By default, tests delete the `./browser-snapshots` before each `Browser` suite

package/RELEASE_NOTES.md

@@ -1,3 +1,27 @@
+# 0.10.0
+
+- Added handling of the new headless mode in Chromium (#45)
+- Fixed an issue that prevented Chromium to be installed on macOS ARM processors
+(!59)
+- Changed documentation nullable parameters to optional parameters (#41)
+- Increased the npm geckodriver version to 3.1.0 (!57)
+- Fixed an issue with Windows Edge and msedgedriver, which occasionally failed
+when building the driver (!56)
+
+# 0.9.0
+
+- Fixed a Chromium install issue by increasing the value of
+`MAX_VERSION_DECREMENTS` (!52)
+- `installBrowser()`, `getDriver()` and `download()` have a new optional timeout
+parameter on file downloads (!51)
+
+### Testing
+
+- Added a test checking that downloaded browser-snapshot files are actually
+cached (#35)
+- Tests running the minimum firefox version showed occasional failures. That was
+fixed by increasing the shared memory size of the docker image (!50)
+
 # 0.8.0
 
 - Move `takeFullPageScreenshot` to the utils module (#38)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeo/get-browser-binary",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Install browser binaries and matching webdrivers",
   "repository": {
     "type": "git",
@@ -30,17 +30,17 @@
   "dependencies": {
     "dmg": "^0.1.0",
     "extract-zip": "^2.0.1",
-    "geckodriver": "^3.0.2",
-    "got": "^11.8.2",
-    "jimp": "^0.16.2",
-    "selenium-webdriver": "^4.7.1"
+    "geckodriver": "3.1.0",
+    "got": "^12.5.3",
+    "jimp": "^0.22.4",
+    "selenium-webdriver": "^4.8.0"
   },
   "devDependencies": {
-    "eslint": "^8.17.0",
+    "eslint": "^8.33.0",
     "eslint-config-eyeo": "^3.2.0",
-    "expect": "^25.5.0",
-    "jsdoc": "^3.6.10",
-    "mocha": "^10.0.0"
+    "expect": "^29.4.2",
+    "jsdoc": "^4.0.0",
+    "mocha": "^10.2.0"
   },
   "scripts": {
     "docs": "jsdoc --readme README.md --destination docs src/*.js",

package/src/browsers.js

@@ -25,7 +25,6 @@ import webdriver from "selenium-webdriver";
 import chrome from "selenium-webdriver/chrome.js";
 import firefox from "selenium-webdriver/firefox.js";
 import edge from "selenium-webdriver/edge.js";
-import command from "selenium-webdriver/lib/command.js";
 import extractZip from "extract-zip";
 
 import {download, extractTar, extractDmg, killDriverProcess, wait}
@@ -50,12 +49,19 @@ const BROWSER_DOWNLOAD_ERROR = "Browser download failed";
 const BROWSER_NOT_INSTALLED_ERROR = "Browser is not installed";
 const ELEMENT_NOT_FOUND_ERROR = "HTML element not found";
 
+function getMajorVersion(versionNumber) {
+  let majorVersion = parseInt(versionNumber && versionNumber.split(".")[0], 10);
+  if (isNaN(majorVersion))
+    throw new Error(`${UNSUPPORTED_VERSION_ERROR}: ${versionNumber}`);
+
+  return majorVersion;
+}
+
 function checkVersion(version, minVersion, channels = []) {
   if (channels.includes(version))
     return;
 
-  let mainVersion = parseInt(version && version.split(".")[0], 10);
-  if (isNaN(mainVersion) || mainVersion < minVersion)
+  if (getMajorVersion(version) < minVersion)
     throw new Error(`${UNSUPPORTED_VERSION_ERROR}: ${version}`);
 }
 
@@ -72,27 +78,28 @@ function checkPlatform() {
 class Browser {
   /**
    * @typedef {Object} BrowserBinary
-   * @property {string} binary - The path to the browser binary.
-   * @property {string} versionNumber - The version number of the browser
-   *   binary.
+   * @property {string} binary The path to the browser binary.
+   * @property {string} versionNumber The version number of the browser binary.
    */
 
   /**
    * Installs the browser. The installation process is detailed on the
    *   subclasses.
-   * @param {string} version - Either full version number or channel/release.
-   *   Please find examples on the subclasses.
+   * @param {string} [version=latest] Either full version number or
+   *   channel/release. Please find examples on the subclasses.
+   * @param {number} [downloadTimeout=0] Allowed time in ms for the download of
+   *   install files to complete. When set to 0 there is no time limit.
    * @return {BrowserBinary}
    * @throws {Error} Unsupported browser version, Unsupported platform, Browser
    *   download failed.
    */
-  static async installBrowser(version) {
+  static async installBrowser(version, downloadTimeout = 0) {
     // to be implemented by the subclass
   }
 
   /**
    * Gets the installed version returned by the browser binary.
-   * @param {string} binary - The path to the browser binary.
+   * @param {string} binary The path to the browser binary.
    * @return {string} Installed browser version.
    */
   static async getInstalledVersion(binary) {
@@ -116,37 +123,41 @@ class Browser {
 
   /**
    * @typedef {Object} driverOptions
-   * @property {boolean} headless=true - Run the browser in headless mode,
-   *   or not.
-   * @property {Array.<string>} [extensionPaths=[]] - Loads extensions to the
+   * @property {boolean} [headless=true] Run the browser in headless mode,
+   *   or not. In Chromium >= 111, the
+   *   {@link https://developer.chrome.com/articles/new-headless/ new headless mode}
+   *   is used.
+   * @property {Array.<string>} [extensionPaths=[]] Loads extensions to the
    *   browser.
-   * @property {boolean} incognito=false - Runs the browser in incognito mode,
+   * @property {boolean} [incognito=false] Runs the browser in incognito mode,
    *   or not.
-   * @property {boolean} insecure=false - Forces the browser to accept insecure
+   * @property {boolean} [insecure=false] Forces the browser to accept insecure
    *   certificates, or not.
-   * @property {Array.<string>} [extraArgs=[]] - Additional arguments to start
+   * @property {Array.<string>} [extraArgs=[]] Additional arguments to start
    *   the browser with.
    */
 
   /**
    * Installs the webdriver matching the browser version and runs the
    * browser. If needed, the browser binary is also installed.
-   * @param {string} version - Either full version number or channel/release.
-   *   Please find examples on the subclasses.
-   * @param {driverOptions?} options - Options to start the browser with.
+   * @param {string} [version=latest] Either full version number or
+   *   channel/release. Please find examples on the subclasses.
+   * @param {driverOptions} [options={}] Options to start the browser with.
+   * @param {number} [downloadTimeout=0] Allowed time in ms for the download of
+   *   browser install files to complete. When set to 0 there is no time limit.
    * @return {webdriver}
    * @throws {Error} Unsupported browser version, Unsupported platform, Browser
    *   download failed, Driver download failed, Unable to start driver.
    */
-  static async getDriver(version, options = {}) {
+  static async getDriver(version, options = {}, downloadTimeout = 0) {
     // to be implemented by the subclass
   }
 
   /**
    * By default, extensions are disabled in incognito mode. This function
    * enables the extension when loaded in incognito.
-   * @param {webdriver} driver - The driver controlling the browser.
-   * @param {string} extensionTitle - Title of the extebsion to be enabled.
+   * @param {webdriver} driver The driver controlling the browser.
+   * @param {string} extensionTitle Title of the extension to be enabled.
    * @return {webdriver}
    * @throws {Error} Unsupported browser version, Extension not found, HTML
    *   element not found.
@@ -179,7 +190,7 @@ class Chromium extends Browser {
       "win32-x64": "win64",
       "linux-x64": "linux",
       "darwin-x64": "mac",
-      "dawrin-arm64": "mac_arm64"
+      "darwin-arm64": "mac_arm64"
     }[platformArch];
     let data = await got(`https://omahaproxy.appspot.com/all.json?os=${os}`).json();
     let release = data[0].versions.find(ver => ver.channel == channel);
@@ -206,15 +217,17 @@ class Chromium extends Browser {
   /**
    * Installs the browser. The Chromium executable gets extracted in the
    *   {@link snapshotsBaseDir} folder, ready to go.
-   * @param {string} version - Either "latest", "beta", "dev" or a full version
-   *   number (i.e. "77.0.3865.0"). Defaults to "latest".
+   * @param {string} [version=latest] Either "latest", "beta", "dev" or a full
+   *   version number (i.e. "77.0.3865.0").
+   * @param {number} [downloadTimeout=0] Allowed time in ms for the download of
+   *   install files to complete. When set to 0 there is no time limit.
    * @return {BrowserBinary}
    * @throws {Error} Unsupported browser version, Unsupported platform, Browser
    *   download failed.
    */
-  static async installBrowser(version = "latest") {
+  static async installBrowser(version = "latest", downloadTimeout = 0) {
     const MIN_VERSION = 75;
-    const MAX_VERSION_DECREMENTS = 80;
+    const MAX_VERSION_DECREMENTS = 200;
 
     checkVersion(version, MIN_VERSION, Chromium.#CHANNELS);
     let versionNumber = await Chromium.#getVersionForChannel(version);
@@ -228,7 +241,7 @@ class Chromium extends Browser {
       "win32-x64": ["Win_x64", "chrome-win.zip"],
       "linux-x64": ["Linux_x64", "chrome-linux.zip"],
       "darwin-x64": ["Mac", "chrome-mac.zip"],
-      "dawrin-arm64": ["Mac_Arm", "chrome-mac.zip"]
+      "darwin-arm64": ["Mac_Arm", "chrome-mac.zip"]
     }[platformArch];
     let archive;
     let browserDir;
@@ -248,23 +261,27 @@ class Chromium extends Browser {
       await fs.promises.mkdir(path.dirname(browserDir), {recursive: true});
 
       archive = path.join(snapshotsDir, "cache", `${base}-${fileName}`);
+      let url = `https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/${platformDir}%2F${base}%2F${fileName}?alt=media`;
       try {
         try {
           await fs.promises.access(archive);
         }
         catch (e) {
-          await download(
-            `https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/${platformDir}%2F${base}%2F${fileName}?alt=media`,
-            archive);
+          await download(url, archive, downloadTimeout);
         }
         break;
       }
-      catch (e) {
-        // Chromium advises decrementing the branch_base_position when no
-        // matching build was found. See https://www.chromium.org/getting-involved/download-chromium
-        base--;
-        if (base <= startBase - MAX_VERSION_DECREMENTS)
-          throw new Error(`${BROWSER_DOWNLOAD_ERROR}: Chromium base ${startBase}`);
+      catch (err) {
+        if (err.name == "HTTPError") {
+          // Chromium advises decrementing the branch_base_position when no
+          // matching build was found. See https://www.chromium.org/getting-involved/download-chromium
+          base--;
+          if (base <= startBase - MAX_VERSION_DECREMENTS)
+            throw new Error(`${BROWSER_DOWNLOAD_ERROR}: Chromium base ${startBase}`);
+        }
+        else {
+          throw new Error(`${BROWSER_DOWNLOAD_ERROR}: ${url}\n${err}`);
+        }
       }
     }
     await extractZip(archive, {dir: browserDir});
@@ -302,10 +319,7 @@ class Chromium extends Browser {
 
     await killDriverProcess("chromedriver");
     let driverPath = path.join(cacheDir, zip.split(".")[0], driverBinary);
-    try {
-      await fs.promises.rm(driverPath, {recursive: true});
-    }
-    catch (e) {} // file does not exist
+    await fs.promises.rm(driverPath, {force: true});
     await extractZip(archive, {dir: cacheDir});
 
     return driverPath;
@@ -315,15 +329,22 @@ class Chromium extends Browser {
   static async getDriver(version = "latest", {
     headless = true, extensionPaths = [], incognito = false, insecure = false,
     extraArgs = []
-  } = {}) {
-    let {binary, versionNumber, base} = await Chromium.installBrowser(version);
+  } = {}, downloadTimeout = 0) {
+    let {binary, versionNumber, base} =
+      await Chromium.installBrowser(version, downloadTimeout);
     let driverPath = await Chromium.#installDriver(base, versionNumber);
     let serviceBuilder = new chrome.ServiceBuilder(driverPath);
     let options = new chrome.Options().addArguments("no-sandbox", ...extraArgs);
     if (extensionPaths.length > 0)
       options.addArguments(`load-extension=${extensionPaths.join(",")}`);
-    if (headless)
-      options.headless();
+    if (headless) {
+      // New headless mode introduced in Chrome 111
+      // https://developer.chrome.com/articles/new-headless/
+      if (getMajorVersion(versionNumber) >= 111)
+        options.addArguments("headless=new");
+      else
+        options.headless();
+    }
     if (insecure)
       options.addArguments("ignore-certificate-errors");
     if (incognito)
@@ -412,13 +433,15 @@ class Firefox extends Browser {
   /**
    * Installs the browser. The Firefox executable gets extracted in the
    *   {@link snapshotsBaseDir} folder, ready to go.
-   * @param {string} version - Either "latest", "beta" or a full version
-   *   number (i.e. "68.0"). Defaults to "latest".
+   * @param {string} [version=latest] Either "latest", "beta" or a full version
+   *   number (i.e. "68.0").
+   * @param {number} [downloadTimeout=0] Allowed time in ms for the download of
+   *   install files to complete. When set to 0 there is no time limit.
    * @return {BrowserBinary}
    * @throws {Error} Unsupported browser version, Unsupported platform, Browser
    *   download failed.
    */
-  static async installBrowser(version = "latest") {
+  static async installBrowser(version = "latest", downloadTimeout = 0) {
     const MIN_VERSION = 60;
 
     checkVersion(version, MIN_VERSION, Firefox.#CHANNELS);
@@ -450,7 +473,7 @@ class Firefox extends Browser {
     catch (e) {
       let url = `https://archive.mozilla.org/pub/firefox/releases/${versionNumber}/${buildPlatform}/en-US/${fileName}`;
       try {
-        await download(url, archive);
+        await download(url, archive, downloadTimeout);
       }
       catch (err) {
         throw new Error(`${BROWSER_DOWNLOAD_ERROR}: ${url}\n${err}`);
@@ -465,8 +488,8 @@ class Firefox extends Browser {
   static async getDriver(version = "latest", {
     headless = true, extensionPaths = [], incognito = false, insecure = false,
     extraArgs = []
-  } = {}) {
-    let {binary} = await Firefox.installBrowser(version);
+  } = {}, downloadTimeout = 0) {
+    let {binary} = await Firefox.installBrowser(version, downloadTimeout);
 
     let options = new firefox.Options();
     if (headless)
@@ -498,11 +521,8 @@ class Firefox extends Browser {
     }, 30000, `${DRIVER_START_ERROR}: geckodriver`, 1000);
 
     for (let extensionPath of extensionPaths) {
-      await driver.execute(
-        new command.Command("install addon")
-          .setParameter("path", extensionPath)
-          .setParameter("temporary", true)
-      );
+      let temporary = true; // Parameter not documented on the webdriver docs
+      await driver.installAddon(extensionPath, temporary);
     }
     return driver;
   }
@@ -551,8 +571,7 @@ class Edge extends Browser {
         versionNumbers.push(matches[2]);
 
       let compareVersions = (v1, v2) =>
-        parseInt(v1.split(".")[0], 10) < parseInt(v2.split(".")[0], 10) ?
-          1 : -1;
+        getMajorVersion(v1) < getMajorVersion(v2) ? 1 : -1;
       versionNumber = versionNumbers.sort(compareVersions)[0];
     }
     else {
@@ -599,13 +618,15 @@ class Edge extends Browser {
    * Installs the browser. On Linux, Edge is installed as a system package,
    *   which requires root permissions. On MacOS, Edge is installed as a user
    *   app (not as a system app). Installing Edge on Windows is not supported.
-   * @param {string} version - Either "latest", "beta", "dev" or a full version
-   *   number (i.e. "95.0.1020.40"). Defaults to "latest".
+   * @param {string} [version=latest] Either "latest", "beta", "dev" or a full
+   *   version number (i.e. "95.0.1020.40").
+   * @param {number} [downloadTimeout=0] Allowed time in ms for the download of
+   *   install files to complete. When set to 0 there is no time limit.
    * @return {BrowserBinary}
    * @throws {Error} Unsupported browser version, Unsupported platform, Browser
    *   download failed.
    */
-  static async installBrowser(version = "latest") {
+  static async installBrowser(version = "latest", downloadTimeout = 0) {
     if (platform == "win32")
       // Edge is mandatory on Windows, can't be uninstalled or downgraded
       // https://support.microsoft.com/en-us/microsoft-edge/why-can-t-i-uninstall-microsoft-edge-ee150b3b-7d7a-9984-6d83-eb36683d526d
@@ -642,7 +663,7 @@ class Edge extends Browser {
     catch (e) {}
 
     try {
-      await download(url, archive);
+      await download(url, archive, downloadTimeout);
     }
     catch (err) {
       throw new Error(`${BROWSER_DOWNLOAD_ERROR}: ${url}\n${err}`);
@@ -653,10 +674,7 @@ class Edge extends Browser {
     }
     else if (platform == "darwin") {
       let appName = Edge.#getDarwinAppName(channel);
-      try {
-        await fs.promises.rm(`${process.env.HOME}/Applications/${appName}.app`, {recursive: true});
-      }
-      catch (e) {}
+      await fs.promises.rm(`${process.env.HOME}/Applications/${appName}.app`, {force: true, recursive: true});
       await promisify(exec)(`installer -pkg ${archive} -target CurrentUserHomeDirectory`);
     }
 
@@ -673,10 +691,7 @@ class Edge extends Browser {
   static async #installDriver() {
     async function extractEdgeZip(archive, cacheDir, driverPath) {
       await killDriverProcess("msedgedriver");
-      try {
-        await fs.promises.rm(driverPath, {recursive: true});
-      }
-      catch (e) {} // file does not exist
+      await fs.promises.rm(driverPath, {force: true});
       await extractZip(archive, {dir: cacheDir});
     }
 
@@ -727,9 +742,9 @@ class Edge extends Browser {
   static async getDriver(version = "latest", {
     headless = true, extensionPaths = [], incognito = false, insecure = false,
     extraArgs = []
-  } = {}) {
+  } = {}, downloadTimeout = 0) {
     if (platform == "linux" || platform == "darwin")
-      await Edge.installBrowser(version);
+      await Edge.installBrowser(version, downloadTimeout);
 
     let driverPath = await Edge.#installDriver();
     let serviceBuilder = new edge.ServiceBuilder(driverPath);
@@ -749,7 +764,22 @@ class Edge extends Browser {
     builder.setEdgeOptions(options);
     builder.setEdgeService(serviceBuilder);
 
-    return builder.build();
+    let driver;
+    // On Windows CI, occasionally a SessionNotCreatedError is thrown, likely
+    // due to low OS resources, that's why building the driver is retried
+    await wait(async() => {
+      try {
+        driver = await builder.build();
+        return true;
+      }
+      catch (err) {
+        if (err.name != "SessionNotCreatedError")
+          throw err;
+        await killDriverProcess("msedgedriver");
+      }
+    }, 30000, `${DRIVER_START_ERROR}: msedgedriver`, 1000);
+
+    return driver;
   }
 
   /** @see Browser.enableExtensionInIncognito */
@@ -776,11 +806,10 @@ class Edge extends Browser {
 
 /**
  * @type {Object}
- * @property {Chromium} chromium - Browser and webdriver functionality for
+ * @property {Chromium} chromium Browser and webdriver functionality for
  *   Chromium.
- * @property {Firefox} firefox - Browser and webdriver functionality for
- *   Firefox.
- * @property {Edge} edge - Browser and webdriver functionality for Edge.
+ * @property {Firefox} firefox Browser and webdriver functionality for Firefox.
+ * @property {Edge} edge Browser and webdriver functionality for Edge.
  */
 export const BROWSERS = {
   chromium: Chromium,

package/src/utils.js

@@ -25,31 +25,43 @@ import got from "got";
 import dmg from "dmg";
 import Jimp from "jimp";
 
+
 /**
  * Downloads url resources.
- * @param {string} url - The url of the resource to be downloaded.
- * @param {string} destFile - The destination file path.
- * @throws {TypeError} Invalid URL.
+ * @param {string} url The url of the resource to be downloaded.
+ * @param {string} destFile The destination file path.
+ * @param {number} [timeout=0] Allowed time in ms for the download to complete.
+ *   When set to 0 there is no time limit.
+ * @throws {TypeError} Invalid URL, Download timeout.
  */
-export async function download(url, destFile) {
+export async function download(url, destFile, timeout = 0) {
   let cacheDir = path.dirname(destFile);
-
   await fs.promises.mkdir(cacheDir, {recursive: true});
 
   let tempDest = `${destFile}-${process.pid}`;
   let writable = fs.createWriteStream(tempDest);
-
+  let timeoutID;
   try {
-    await promisify(pipeline)(got.stream(url), writable);
+    let downloading = promisify(pipeline)(got.stream(url), writable);
+    if (timeout == 0) {
+      await downloading;
+    }
+    else {
+      let timeoutPromise = new Promise((resolve, reject) => {
+        timeoutID = setTimeout(
+          () => reject(`Download timeout after ${timeout}ms`), timeout);
+      });
+      await Promise.race([downloading, timeoutPromise]);
+    }
   }
   catch (error) {
-    try {
-      await fs.promises.rm(tempDest, {recursive: true});
-    }
-    catch (e) {}
-
+    await fs.promises.rm(tempDest, {force: true});
     throw error;
   }
+  finally {
+    if (timeoutID)
+      clearTimeout(timeoutID);
+  }
 
   await fs.promises.rename(tempDest, destFile);
 }
@@ -152,9 +164,9 @@ export function wait(condition, timeout = 0, message, pollTimeout = 100) {
 
 /**
  * Takes a screenshot of the full page by scrolling from top to bottom.
- * @param {webdriver} driver - The driver controlling the browser.
- * @property {boolean} hideScrollbars=true - Hides any scrollbars before
- *   taking the screenshot, or not.
+ * @param {webdriver} driver The driver controlling the browser.
+ * @param {boolean} [hideScrollbars=true] Hides any scrollbars before taking
+ *   the screenshot, or not.
  * @return {Jimp} A Jimp image object containing the screenshot.
  * @example
  * // Getting a base-64 encoded PNG from the returned Jimp image

package/test/browsers.js

@@ -16,7 +16,7 @@
  */
 
 import fs from "fs";
-import expect from "expect";
+import {expect} from "expect";
 import path from "path";
 
 import {BROWSERS, snapshotsBaseDir, takeFullPageScreenshot} from "../index.js";
@@ -104,21 +104,47 @@ function getExtension(browser, version) {
   return {extensionPaths, manifest};
 }
 
+async function getCachedTimes(browser) {
+  let cacheDir = path.join(snapshotsBaseDir, browser, "cache");
+  let cacheFiles = await fs.promises.readdir(cacheDir);
+
+  let browserCacheTime = null;
+  // Edge gets installed at OS level, that's why it's not tested here
+  if (browser != "edge") {
+    let installTypes = [".zip", ".dmg", ".bz2"];
+    let browserZip =
+      cacheFiles.find(elem => installTypes.some(type => elem.includes(type)));
+    let browserStat = await fs.promises.stat(path.join(cacheDir, browserZip));
+    browserCacheTime = browserStat.ctimeMs;
+  }
+
+  let driverCacheTime = null;
+  // Firefox install file includes the driver, that's why it's not tested here
+  if (browser != "firefox") {
+    let driverDir = cacheFiles.find(elem => !elem.endsWith(".zip"));
+    let driverFiles = await fs.promises.readdir(path.join(cacheDir, driverDir));
+    let driverZip = driverFiles.find(elem => elem.endsWith(".zip"));
+    let driverStat =
+      await fs.promises.stat(path.join(cacheDir, driverDir, driverZip));
+    driverCacheTime = driverStat.ctimeMs;
+  }
+
+  return {browserCTime: browserCacheTime, driverCTime: driverCacheTime};
+}
+
 for (let browser of Object.keys(BROWSERS)) {
   describe(`Browser: ${browser}`, () => {
     before(async() => {
       if (process.env.TEST_KEEP_SNAPSHOTS == "true")
         return;
 
-      try {
-        await fs.promises.rm(snapshotsBaseDir, {recursive: true});
-      }
-      catch (e) {}
+      await fs.promises.rm(snapshotsBaseDir, {force: true, recursive: true});
     });
 
     for (let version of VERSIONS[browser]) {
       describe(`Version: ${version}`, () => {
         let driver = null;
+        let emptyCacheTimes = null;
 
         async function quitDriver() {
           if (!driver)
@@ -140,7 +166,7 @@ for (let browser of Object.keys(BROWSERS)) {
             this.skip();
 
           let {binary, versionNumber} =
-            await BROWSERS[browser].installBrowser(version);
+            await BROWSERS[browser].installBrowser(version, 60000);
           let browserName = browser == "edge" ? /(edge|Edge)/ : browser;
           expect(binary).toEqual(expect.stringMatching(browserName));
 
@@ -165,6 +191,23 @@ for (let browser of Object.keys(BROWSERS)) {
 
           expect((await driver.getCapabilities()).getBrowserName())
             .toEqual(expect.stringMatching(names[browser]));
+
+          // When running all tests, this saves time on the cache test
+          emptyCacheTimes = await getCachedTimes(browser);
+        });
+
+        it("uses cached install files", async() => {
+          if (emptyCacheTimes == null) { // Single test case run
+            driver = await BROWSERS[browser].getDriver(version);
+            emptyCacheTimes = await getCachedTimes(browser);
+            await quitDriver();
+          }
+
+          // assigning `driver` to allow the afterEach hook quit the driver
+          driver = await BROWSERS[browser].getDriver(version);
+          let existingCacheTimes = await getCachedTimes(browser);
+
+          expect(existingCacheTimes).toEqual(emptyCacheTimes);
         });
 
         it("supports extra args", async() => {
@@ -199,7 +242,9 @@ for (let browser of Object.keys(BROWSERS)) {
         });
 
         it("loads an extension", async() => {
-          let headless = browser == "firefox";
+          // Chromium's old headless mode doesn't support loading extensions
+          let headless = browser == "firefox" || (browser == "chromium" &&
+            ["latest", "beta", "dev"].includes(version));
           let {extensionPaths} = getExtension(browser, version);
 
           driver = await BROWSERS[browser].getDriver(

package/test/utils.js

@@ -16,7 +16,7 @@
  */
 
 import fs from "fs";
-import expect from "expect";
+import {expect} from "expect";
 import path from "path";
 
 import {snapshotsBaseDir, download} from "../index.js";
@@ -25,18 +25,34 @@ describe("Utils", () => {
   it("defines a browser snapshots folder", () => expect(snapshotsBaseDir)
     .toBe(path.join(process.cwd(), "browser-snapshots")));
 
+  let resourceUrl = "https://gitlab.com/eyeo/developer-experience/get-browser-binary/-/raw/main/package.json";
   let destFile = path.join(snapshotsBaseDir, "download-test.txt");
+  let expectedFileContents = "\"name\": \"@eyeo/get-browser-binary\"";
 
   it("downloads resources", async() => {
-    let url = "https://gitlab.com/eyeo/developer-experience/get-browser-binary/-/raw/main/package.json";
-    await download(url, destFile);
+    await fs.promises.rm(destFile, {force: true});
+    await download(resourceUrl, destFile);
     let contents = await fs.promises.readFile(destFile, {encoding: "utf8"});
-    expect(contents).toEqual(
-      expect.stringContaining("\"name\": \"@eyeo/get-browser-binary\""));
+    expect(contents).toEqual(expect.stringContaining(expectedFileContents));
   });
 
-  it("does not download invalid resources", async() => {
-    expect(download("invalid", destFile)).rejects
-      .toThrow("TypeError [ERR_INVALID_URL]: Invalid URL");
+  it("downloads resources on long timeout", async() => {
+    await fs.promises.rm(destFile, {force: true});
+    await download(resourceUrl, destFile, 10000);
+    let contents = await fs.promises.readFile(destFile, {encoding: "utf8"});
+    expect(contents).toEqual(expect.stringContaining(expectedFileContents));
+  });
+
+  it("does not download on short timeout", async() => {
+    try {
+      await download(resourceUrl, destFile, 10);
+      throw new Error("Download timeout didn't throw");
+    }
+    catch (err) {
+      expect(err).toBe("Download timeout after 10ms");
+    }
   });
+
+  it("does not download invalid resources", () =>
+    expect(download("invalid", destFile)).rejects.toThrow("Invalid URL"));
 });