@eyeo/get-browser-binary 0.20.0 → 0.20.2

package/RELEASE_NOTES.md

@@ -1,5 +1,13 @@
 # Unreleased
 
+# 0.20.2
+
+- Fixes getting majorVersion on Edge (!133)
+
+# 0.20.1
+
+- Fixes enabling developer mode (!131)
+
 # 0.20.0
 
 - Enable developer mode for incognito tests (!126)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eyeo/get-browser-binary",
-  "version": "0.20.0",
+  "version": "0.20.2",
   "description": "Install browser binaries and matching webdrivers",
   "repository": {
     "type": "git",

package/src/chromium.js

@@ -28,6 +28,8 @@ import {download, getMajorVersion, checkVersion, checkPlatform, errMsg,
         snapshotsBaseDir, platformArch, checkExtensionPaths} from "./utils.js";
 
 async function enableDeveloperMode(driver) {
+  const currentHandle = await driver.getWindowHandle();
+
   await driver.switchTo().newWindow("window");
   await driver.navigate().to("chrome://extensions");
   await driver.executeScript(() => {
@@ -39,6 +41,20 @@ async function enableDeveloperMode(driver) {
     if (!devModeToggle.checked)
       devModeToggle.click();
   });
+
+  await driver.wait(async() => {
+    const checked = await driver.executeScript(() => {
+      const devModeToggle = document
+      .querySelector("extensions-manager").shadowRoot
+      .getElementById("toolbar").shadowRoot
+      .querySelector("#toolbar #devMode");
+      return devModeToggle.checked;
+    });
+    return checked;
+  }, 500);
+
+  await driver.close();
+  await driver.switchTo().window(currentHandle);
 }
 
 /**

package/src/edge.js

@@ -32,11 +32,26 @@ import {download, killDriverProcess, wait, getMajorVersion, checkVersion,
 let {platform} = process;
 
 async function enableDeveloperMode(driver) {
+  const currentHandle = await driver.getWindowHandle();
+  await driver.switchTo().newWindow("window");
   await driver.navigate().to("edge://extensions/");
-  const devModeToggle = driver.findElement(By.id("developer-mode"));
 
-  if (!devModeToggle.checked)
-    devModeToggle.click();
+  await driver.executeScript(() => {
+    const devModeToggle = document.getElementById("developer-mode");
+    if (!devModeToggle.checked)
+      devModeToggle.click();
+  });
+
+  await driver.wait(async() => {
+    const checked = await driver.executeScript(() => {
+      const devModeToggle = document.getElementById("developer-mode");
+      return devModeToggle.checked;
+    });
+    return checked;
+  }, 500);
+
+  await driver.close();
+  await driver.switchTo().window(currentHandle);
 }
 
 /**
@@ -208,6 +223,7 @@ export class Edge extends Browser {
     }
 
     let options = new edge.Options().addArguments("no-sandbox", ...extraArgs);
+    let majorVersion = getMajorVersion(versionNumber);
     if (headless) {
       if (versionNumber && getMajorVersion(versionNumber) >= 114)
         options.addArguments("headless=new");
@@ -244,9 +260,10 @@ export class Edge extends Browser {
       }
     }, 30000, `${errMsg.driverStart}: msedgedriver`, 1000);
 
-    // Developer mode needs to be enabled
+    // From Edge 134 on, developer mode needs to be enabled
     // for custom extensions to work properly
-    await enableDeveloperMode(driver);
+    if (majorVersion >= 134)
+      await enableDeveloperMode(driver);
 
     return driver;
   }
@@ -261,7 +278,7 @@ export class Edge extends Browser {
         continue;
 
       for (let button of await elem.findElements(By.css("button"))) {
-        text = await elem.getAttribute("innerHTML");
+        text = await button.getAttribute("outerHTML");
         if (!text.includes("Details"))
           continue;
 

package/test/browsers.js

@@ -224,6 +224,11 @@ for (let browser of Object.keys(BROWSERS)) {
 
         it("runs", async function() {
           driver = await BROWSERS[browser].getDriver(version);
+          const url = await driver.getCurrentUrl();
+          // check that default automation tab is in focus:
+          // data;, (chromium) and about:blank (firefox)
+          expect(url).toEqual(expect.stringMatching(/^(data:,|about:blank)$/));
+
           await basicUrlTest(driver, browser);
 
           let browserVersion =