un-firefoxify

Author: kubukoz

build.sbt

@@ -1,13 +1,11 @@
-import org.openqa.selenium.firefox.FirefoxOptions
-import org.openqa.selenium.firefox.FirefoxDriver
 import sbt.Keys._
 
 import org.scalajs.sbtplugin.ScalaJSCrossVersion
 
 import org.openqa.selenium.Capabilities
 
 import org.scalajs.jsenv.selenium.SeleniumJSEnv
-import org.scalajs.jsenv.selenium.TestCapabilities
+import org.scalajs.jsenv.selenium.TestDrivers
 
 // we're breaking bincompat with the bump to selenium 4
 val previousVersion: Option[String] = None
@@ -63,12 +61,8 @@ val previousArtifactSetting = Def.settings(
   }
 )
 
-val jsEnvCapabilities = settingKey[org.openqa.selenium.Capabilities](
-    "Capabilities of the SeleniumJSEnv")
-
 val testSettings: Seq[Setting[_]] = commonSettings ++ Seq(
-  jsEnvCapabilities := TestCapabilities.fromEnv,
-  jsEnv := new SeleniumJSEnv(jsEnvCapabilities.value, SeleniumJSEnv.Config().withDriverFactory(caps => new FirefoxDriver(new FirefoxOptions(caps)))),
+  jsEnv := new SeleniumJSEnv(SeleniumJSEnv.Config().withDriverFactory(TestDrivers.fromEnv)),
   scalaJSUseMainModuleInitializer := true
 )
 
@@ -140,10 +134,9 @@ lazy val seleniumJSHttpEnvTest: Project = project.
   settings(
     jsEnv := {
       new SeleniumJSEnv(
-          jsEnvCapabilities.value,
           SeleniumJSEnv.Config()
             .withMaterializeInServer("tmp", "http://localhost:8080/tmp/")
-            .withDriverFactory((caps) => new FirefoxDriver(new FirefoxOptions(caps)))
+            .withDriverFactory(TestDrivers.fromEnv)
       )
     },
     scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.ESModule) }

project/build.sbt

@@ -11,12 +11,12 @@ addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")
 libraryDependencies ~=
   ("org.seleniumhq.selenium" % "selenium-java" % "4.25.0" +: _)
 
-unmanagedSourceDirectories in Compile ++= {
+Compile / unmanagedSourceDirectories ++= {
   val root = baseDirectory.value.getParentFile
   Seq(root / "seleniumJSEnv/src/main/scala")
 }
 
-sources in Compile += {
+Compile / sources += {
   val root = baseDirectory.value.getParentFile
-  root / "seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/TestCapabilities.scala"
+  root / "seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/TestDrivers.scala"
 }

seleniumJSEnv/src/main/scala/org/scalajs/jsenv/selenium/SeleniumJSEnv.scala

@@ -11,18 +11,9 @@ import org.openqa.selenium.WebDriver
 import org.openqa.selenium.JavascriptExecutor
 import org.openqa.selenium.Platform
 
-final class SeleniumJSEnv(capabilities: Capabilities, config: SeleniumJSEnv.Config) extends JSEnv {
+final class SeleniumJSEnv(config: SeleniumJSEnv.Config) extends JSEnv {
 
-  def this(capabilities: Capabilities) =
-    this(capabilities, SeleniumJSEnv.Config())
-
-  private val augmentedCapabilities = {
-    val x = new DesiredCapabilities(capabilities)
-    // x.setJavascriptEnabled(true)
-    x
-  }
-
-  val name: String = s"SeleniumJSEnv ($capabilities)"
+  val name: String = s"SeleniumJSEnv ($config)"
 
   def start(input: Seq[Input], runConfig: RunConfig): JSRun =
     SeleniumRun.start(newDriver _, input, config, runConfig)
@@ -32,7 +23,7 @@ final class SeleniumJSEnv(capabilities: Capabilities, config: SeleniumJSEnv.Conf
 
   private def newDriver() = {
     val driver: WebDriver =
-      config.driverFactory(augmentedCapabilities)
+      config.driverFactory()
 
     /* The first `asInstanceOf`s are a fail-fast for the second one, which
      * scalac partially erases, so that we're sure right now that the last
@@ -60,7 +51,7 @@ object SeleniumJSEnv {
     private def this() = this(
         keepAlive = false,
         materialization = Config.Materialization.Temp,
-        driverFactory = caps => sys.error("No driver factory configured")
+        driverFactory = () =>  sys.error("No driver factory configured")
         )
 
     /** Materializes purely virtual files into a temp directory.

seleniumJSEnv/src/main/scala/org/scalajs/jsenv/selenium/package.scala

@@ -4,5 +4,5 @@ import org.openqa.selenium.WebDriver
 import org.openqa.selenium.Capabilities
 
 package object selenium {
-  type DriverFactory = Capabilities => WebDriver
+  type DriverFactory = () => WebDriver
 }

seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/KeepAliveTest.scala

@@ -55,7 +55,7 @@ class KeepAliveTest {
   private final class MockInjector(driver: WebDriver) extends DriverFactory {
     var used = false
 
-    def apply(caps: Capabilities): WebDriver = {
+    def apply(): WebDriver = {
         require(!used)
         used = true
         driver
@@ -68,7 +68,7 @@ class KeepAliveTest {
     val config = SeleniumJSEnv.Config()
       .withDriverFactory(factory)
       .withKeepAlive(keepAlive)
-    val env = new SeleniumJSEnv(new DesiredCapabilities, config)
+    val env = new SeleniumJSEnv(config)
 
     (driver, factory, env)
   }

seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/SeleniumJSSuite.scala

@@ -14,5 +14,5 @@ import org.openqa.selenium.firefox.FirefoxOptions
 
 @RunWith(classOf[JSEnvSuiteRunner])
 class SeleniumJSSuite extends JSEnvSuite(
-  JSEnvSuiteConfig(new SeleniumJSEnv(TestCapabilities.fromEnv,  SeleniumJSEnv.Config().withDriverFactory(caps => new FirefoxDriver(new FirefoxOptions(caps)))))
+  JSEnvSuiteConfig(new SeleniumJSEnv(SeleniumJSEnv.Config().withDriverFactory(TestDrivers.fromEnv)))
 )

seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/TestCapabilities.scala renamed to seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/TestDrivers.scala

@@ -5,20 +5,27 @@ import org.openqa.selenium.firefox.{FirefoxOptions, FirefoxDriverLogLevel}
 import org.openqa.selenium.chrome.ChromeOptions
 
 import java.util.logging.{Logger, Level}
+import org.openqa.selenium.WebDriver
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.chrome.ChromeDriver
 
-object TestCapabilities {
+object TestDrivers {
   // Lower the logging level for Selenium to avoid spam.
   Logger.getLogger("org.openqa.selenium").setLevel(Level.WARNING)
 
-  def fromEnv: Capabilities = nameFromEnv match {
+  val fromEnv: DriverFactory = () => nameFromEnv match {
     case "firefox" =>
-      new FirefoxOptions()
-        .addArguments("--headless")
-        .setLogLevel(FirefoxDriverLogLevel.ERROR)
+      new FirefoxDriver(
+        new FirefoxOptions()
+          .addArguments("--headless")
+          .setLogLevel(FirefoxDriverLogLevel.ERROR)
+      )
 
     case "chrome" =>
-      new ChromeOptions()
-        .addArguments("--headless")
+      new ChromeDriver(
+        new ChromeOptions()
+          .addArguments("--headless")
+      )
 
     case name =>
       throw new IllegalArgumentException(s"Unknown browser $name")