Move to Selenium 4

Author: kubukoz

Diff for: .github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scalaversion: ["2.11.12", "2.12.10", "2.13.1"]
+        scalaversion: ["2.12.10", "2.13.1"]
         browser: ["chrome"]
         include:
           - scalaversion: "2.12.10"
@@ -29,10 +29,10 @@ jobs:
         run: >
           sbt "++${{ matrix.scalaversion }}"
           seleniumJSEnv/scalastyle
-          seleniumJSEnv/test:scalastyle
+          seleniumJSEnv/Test/scalastyle
           seleniumJSEnvTest/scalastyle
-          seleniumJSHttpEnvTest/test:scalastyle
-          seleniumJSEnvTest/test:scalastyle
+          seleniumJSHttpEnvTest/Test/scalastyle
+          seleniumJSEnvTest/Test/scalastyle
       - name: MiMa
         run: sbt "++${{ matrix.scalaversion }}" seleniumJSEnv/mimaReportBinaryIssues
       - name: Unit tests

Diff for: build.sbt

@@ -5,9 +5,10 @@ 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
 
-val previousVersion: Option[String] = Some("1.1.1")
+// we're breaking bincompat with the bump to selenium 4
+val previousVersion: Option[String] = None
 
 val newScalaBinaryVersionsInThisRelease: Set[String] =
   Set()
@@ -16,7 +17,7 @@ val commonSettings: Seq[Setting[_]] = Seq(
   version := "1.1.2-SNAPSHOT",
   organization := "org.scala-js",
   scalaVersion := "2.11.12",
-  crossScalaVersions := Seq("2.11.12", "2.12.10", "2.13.1"),
+  crossScalaVersions := Seq("2.12.10", "2.13.1"),
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 
   homepage := Some(url("http://scala-js.org/")),
@@ -55,12 +56,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),
+  jsEnv := new SeleniumJSEnv(TestDrivers.fromEnv),
   scalaJSUseMainModuleInitializer := true
 )
 
@@ -77,7 +74,7 @@ lazy val seleniumJSEnv: Project = project.
          * It pulls in "closure-compiler-java-6" which in turn bundles some old
          * guava stuff which in turn makes selenium fail.
          */
-        "org.seleniumhq.selenium" % "selenium-server" % "3.141.59",
+        "org.seleniumhq.selenium" % "selenium-java" % "4.25.0",
         "org.scala-js" %% "scalajs-js-envs" % "1.1.1",
         "com.google.jimfs" % "jimfs" % "1.1",
         "org.scala-js" %% "scalajs-js-envs-test-kit" % "1.1.1" % "test",
@@ -117,7 +114,7 @@ lazy val seleniumJSEnv: Project = project.
     pomIncludeRepository := { _ => false },
 
     // The chrome driver seems to not deal with parallelism very well (#47).
-    parallelExecution in Test := false
+    (Test / parallelExecution) := false
   )
 
 lazy val seleniumJSEnvTest: Project = project.
@@ -132,7 +129,7 @@ lazy val seleniumJSHttpEnvTest: Project = project.
   settings(
     jsEnv := {
       new SeleniumJSEnv(
-          jsEnvCapabilities.value,
+          TestDrivers.fromEnv,
           SeleniumJSEnv.Config()
             .withMaterializeInServer("tmp", "http://localhost:8080/tmp/")
       )

Diff for: project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.10.2

Diff for: project/build.sbt

@@ -1,6 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
 
-addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.18")
+addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
 
 addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")
 
@@ -9,14 +9,14 @@ addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "1.0.0")
  * guava stuff which in turn makes selenium fail.
  */
 libraryDependencies ~=
-  ("org.seleniumhq.selenium" % "selenium-server" % "3.141.59" +: _)
+  ("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"
 }

Diff for: seleniumJSEnv/src/main/scala/org/scalajs/jsenv/selenium/SeleniumJSEnv.scala

@@ -1,25 +1,20 @@
 package org.scalajs.jsenv.selenium
 
-import org.openqa.selenium._
-import org.openqa.selenium.remote.DesiredCapabilities
-import org.openqa.selenium.remote.server._
 
 import org.scalajs.jsenv._
 
 import java.net.URL
 import java.nio.file.{Path, Paths}
+import org.openqa.selenium.Capabilities
+import org.openqa.selenium.remote.DesiredCapabilities
+import org.openqa.selenium.WebDriver
+import org.openqa.selenium.JavascriptExecutor
+import org.openqa.selenium.Platform
+import SeleniumJSEnv.DriverFactory
 
-final class SeleniumJSEnv(capabilities: Capabilities, 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
-  }
+final class SeleniumJSEnv(driverFactory: DriverFactory, config: SeleniumJSEnv.Config) extends JSEnv {
 
-  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)
@@ -29,7 +24,7 @@ final class SeleniumJSEnv(capabilities: Capabilities, config: SeleniumJSEnv.Conf
 
   private def newDriver() = {
     val driver: WebDriver =
-      config.driverFactory.newInstance(augmentedCapabilities)
+      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
@@ -43,20 +38,22 @@ final class SeleniumJSEnv(capabilities: Capabilities, config: SeleniumJSEnv.Conf
 
     driver.asInstanceOf[WebDriver with JavascriptExecutor]
   }
+
+  def this(driverFactory: DriverFactory) = this(driverFactory, SeleniumJSEnv.Config())
 }
 
 object SeleniumJSEnv {
+  type DriverFactory = () => WebDriver
+
   final class Config private (
-      val driverFactory: DriverFactory,
       val keepAlive: Boolean,
       val materialization: Config.Materialization
   ) {
     import Config.Materialization
 
     private def this() = this(
         keepAlive = false,
-        materialization = Config.Materialization.Temp,
-        driverFactory = new DefaultDriverFactory(Platform.getCurrent()))
+        materialization = Config.Materialization.Temp)
 
     /** Materializes purely virtual files into a temp directory.
      *
@@ -113,13 +110,9 @@ object SeleniumJSEnv {
     def withKeepAlive(keepAlive: Boolean): Config =
       copy(keepAlive = keepAlive)
 
-    def withDriverFactory(driverFactory: DriverFactory): Config =
-      copy(driverFactory = driverFactory)
-
     private def copy(keepAlive: Boolean = keepAlive,
-        materialization: Config.Materialization = materialization,
-        driverFactory: DriverFactory = driverFactory) = {
-      new Config(driverFactory, keepAlive, materialization)
+        materialization: Config.Materialization = materialization) = {
+      new Config(keepAlive, materialization)
     }
   }
 

Diff for: seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/KeepAliveTest.scala

@@ -7,12 +7,12 @@ import java.net.URL
 
 import org.openqa.selenium._
 import org.openqa.selenium.remote.DesiredCapabilities
-import org.openqa.selenium.remote.server._
 
 import org.junit._
 import org.junit.Assert._
 
 import org.scalajs.jsenv._
+import org.scalajs.jsenv.selenium.SeleniumJSEnv.DriverFactory
 
 class KeepAliveTest {
   private final class MockWebDriver extends WebDriver with JavascriptExecutor {
@@ -56,23 +56,19 @@ class KeepAliveTest {
   private final class MockInjector(driver: WebDriver) extends DriverFactory {
     var used = false
 
-    def newInstance(caps: Capabilities): WebDriver = {
+    def apply(): WebDriver = {
       require(!used)
       used = true
       driver
     }
-
-    def hasMappingFor(caps: Capabilities): Boolean = true
-    def registerDriverProvider(p: DriverProvider): Unit = ???
   }
 
   private def setup(keepAlive: Boolean) = {
     val driver = new MockWebDriver
     val factory = new MockInjector(driver)
     val config = SeleniumJSEnv.Config()
-      .withDriverFactory(factory)
       .withKeepAlive(keepAlive)
-    val env = new SeleniumJSEnv(new DesiredCapabilities, config)
+    val env = new SeleniumJSEnv(factory, config)
 
     (driver, factory, env)
   }

Diff for: seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/SeleniumJSEnvSuite.scala renamed to seleniumJSEnv/src/test/scala/org/scalajs/jsenv/selenium/SeleniumJSSuite.scala

@@ -9,8 +9,10 @@ import org.junit.runner.Runner
 import org.junit.runners.Suite
 import org.junit.runner.manipulation.Filter
 import org.junit.runner.Description
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.firefox.FirefoxOptions
 
 @RunWith(classOf[JSEnvSuiteRunner])
 class SeleniumJSSuite extends JSEnvSuite(
-  JSEnvSuiteConfig(new SeleniumJSEnv(TestCapabilities.fromEnv))
+  JSEnvSuiteConfig(new SeleniumJSEnv(TestDrivers.fromEnv))
 )

Diff for: 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,28 @@ 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
+import org.scalajs.jsenv.selenium.SeleniumJSEnv.DriverFactory
 
-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()
-        .setHeadless(true)
-        .setLogLevel(FirefoxDriverLogLevel.ERROR)
+      new FirefoxDriver(
+        new FirefoxOptions()
+          .addArguments("--headless")
+          .setLogLevel(FirefoxDriverLogLevel.ERROR)
+      )
 
     case "chrome" =>
-      new ChromeOptions()
-        .setHeadless(true)
+      new ChromeDriver(
+        new ChromeOptions()
+          .addArguments("--headless")
+      )
 
     case name =>
       throw new IllegalArgumentException(s"Unknown browser $name")