Chrome driver fixes

redskap · Sep 28, 2023 · 3a7f716 · 3a7f716
1 parent 594aeef
commit 3a7f716
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -23,7 +23,14 @@ jobs:
           cache: gradle
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@342dbebe7272035434f9baccc29a816ec6dd2c7b
+      - run: |
       - name: Build & Test
+        uses: nanasess/setup-chromedriver@v2
+        with:
+          chromedriver-version: '111.0.5563.64'
+        env:
+          CHROME_DRIVER_VERSION: 111.0.5563.64
+          CHROME_BROWSER_VERSION: 111.0.5563.64
         run: |
           ./gradlew --no-daemon --console=plain build test
 

diff --git a/swagger-brake-integration-tests/build.gradle b/swagger-brake-integration-tests/build.gradle
@@ -6,9 +6,9 @@ dependencies {
 	testImplementation "ch.qos.logback:logback-core:1.2.11"
 	testImplementation "ch.qos.logback:logback-classic:1.2.11"
 	testImplementation "org.awaitility:awaitility:4.2.0"
-	testImplementation "org.seleniumhq.selenium:selenium-java:4.4.0"
+	testImplementation "org.seleniumhq.selenium:selenium-java:4.13.0"
 	testImplementation "org.seleniumhq.selenium:selenium-chrome-driver:4.4.0"
-	testImplementation "io.github.bonigarcia:webdrivermanager:5.3.0"
+	testImplementation "io.github.bonigarcia:webdrivermanager:5.5.3"
 	testImplementation "org.testcontainers:testcontainers:1.17.3"
 	testImplementation "org.apache.httpcomponents:httpclient:4.5.13"
 	testImplementation "org.projectlombok:lombok:1.18.24"

diff --git a/.../test/java/io/redskap/swagger/brake/integration/artifactory/factory/WebDriverFactory.java b/.../test/java/io/redskap/swagger/brake/integration/artifactory/factory/WebDriverFactory.java
@@ -1,19 +1,22 @@
 package io.redskap.swagger.brake.integration.artifactory.factory;
 
 import io.github.bonigarcia.wdm.WebDriverManager;
+import org.apache.commons.lang3.StringUtils;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 
 public class WebDriverFactory {
-    public static final String BROWSER_VERSION = "111.0.5563.111";
-    public static final String DRIVER_VERSION = "111.0.5563.64";
+    private static final String CHROME_DRIVER_VERSION_ENV_VAR = "CHROME_DRIVER_VERSION";
+    private static final String CHROME_BROWSER_VERSION_ENV_VAR = "CHROME_BROWSER_VERSION";
+    public static final String DEFAULT_DRIVER_VERSION = "111.0.5563.64";
+    public static final String DEFAULT_BROWSER_VERSION = "111.0.5563.111";
 
     public static WebDriver create() {
         WebDriverManager
                 .chromedriver()
-                .browserVersion(BROWSER_VERSION)
-                .driverVersion(DRIVER_VERSION)
+                .browserVersion(getBrowserVersion())
+                .driverVersion(getDriverVersion())
                 .setup();
         ChromeOptions options = new ChromeOptions();
         options.addArguments("start-maximized");
@@ -29,4 +32,20 @@ public static WebDriver create() {
         options.addArguments("--headless");
         return new ChromeDriver(options);
     }
+
+    private static String getDriverVersion() {
+        String chromeDriverVersion = System.getenv(CHROME_DRIVER_VERSION_ENV_VAR);
+        if (StringUtils.isBlank(chromeDriverVersion)) {
+            chromeDriverVersion = DEFAULT_DRIVER_VERSION;
+        }
+        return chromeDriverVersion;
+    }
+
+    private static String getBrowserVersion() {
+        String chromeBrowserVersion = System.getenv(CHROME_BROWSER_VERSION_ENV_VAR);;
+        if (StringUtils.isBlank(chromeBrowserVersion)) {
+            chromeBrowserVersion = DEFAULT_BROWSER_VERSION;
+        }
+        return chromeBrowserVersion;
+    }
 }
diff --git a/...sts/src/test/java/io/redskap/swagger/brake/integration/project/BuildFailureException.java b/...sts/src/test/java/io/redskap/swagger/brake/integration/project/BuildFailureException.java
@@ -1,4 +1,7 @@
 package io.redskap.swagger.brake.integration.project;
 
 public class BuildFailureException extends RuntimeException {
+    public BuildFailureException(String message) {
+        super(message);
+    }
 }
diff --git a/...ests/src/test/java/io/redskap/swagger/brake/integration/project/ProjectContainerBase.java b/...ests/src/test/java/io/redskap/swagger/brake/integration/project/ProjectContainerBase.java
@@ -75,8 +75,7 @@ public boolean isApiBrokenWith(String text) {
     protected boolean isBuildComplete(String logs) {
         boolean isBuildSuccess = isBuildSuccess(logs);
         if (isBuildFailure(logs) || (!isBuildSuccess && !container.isRunning())) {
-            log.error(logs);
-            throw new BuildFailureException();
+            throw new BuildFailureException(logs);
         }
         return isBuildSuccess;
     }