diff --git a/Plan/common/build.gradle b/Plan/common/build.gradle index c803a6f45..e8f9a6dff 100644 --- a/Plan/common/build.gradle +++ b/Plan/common/build.gradle @@ -57,7 +57,7 @@ dependencies { testImplementation project(":api") testImplementation "com.google.code.gson:gson:$gsonVersion" - testImplementation "org.seleniumhq.selenium:selenium-java:4.2.1" + testImplementation "org.seleniumhq.selenium:selenium-java:4.3.0" testImplementation "org.testcontainers:testcontainers:$testContainersVersion" testImplementation "org.testcontainers:junit-jupiter:$testContainersVersion" testImplementation "org.testcontainers:nginx:$testContainersVersion" diff --git a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java index d1808f6e9..abe5a3b44 100644 --- a/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java +++ b/Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/JSErrorRegressionTest.java @@ -208,6 +208,6 @@ class JSErrorRegressionTest { private void assertNoLogs(String testName, List logs) { assertTrue(logs.isEmpty(), () -> testName + "Browser console included " + logs.size() + " logs: " + logs.stream() .map(log -> "\n" + log.getLevel().getName() + " " + log.getMessage()) - .collect(Collectors.toList())); + .toList()); } } \ No newline at end of file diff --git a/Plan/common/src/test/java/extension/SeleniumExtension.java b/Plan/common/src/test/java/extension/SeleniumExtension.java index b17fd7e5e..42995274e 100644 --- a/Plan/common/src/test/java/extension/SeleniumExtension.java +++ b/Plan/common/src/test/java/extension/SeleniumExtension.java @@ -27,16 +27,12 @@ import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.logging.LogType; import org.openqa.selenium.logging.LoggingPreferences; -import org.openqa.selenium.remote.CapabilityType; -import org.openqa.selenium.remote.DesiredCapabilities; import utilities.CIProperties; import java.io.File; import java.util.ArrayList; import java.util.logging.Level; -import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT; - /** * Selenium JUnit 5 Extension. * @@ -75,8 +71,8 @@ public class SeleniumExtension implements ParameterResolver, BeforeAllCallback, private ChromeDriver getChromeWebDriver() { ChromeOptions chromeOptions = new ChromeOptions(); - chromeOptions.setCapability(ChromeOptions.CAPABILITY, getDesiredCapabilities()); - chromeOptions.setCapability(SUPPORTS_JAVASCRIPT, true); + chromeOptions.addArguments("--enable-javascript"); + chromeOptions.setCapability(ChromeOptions.LOGGING_PREFS, getLoggingPreferences()); // Using environment variable assumes linux if (System.getenv(CIProperties.CHROME_DRIVER) != null) { @@ -87,16 +83,14 @@ public class SeleniumExtension implements ParameterResolver, BeforeAllCallback, return new ChromeDriver(chromeOptions); } - private DesiredCapabilities getDesiredCapabilities() { - DesiredCapabilities caps = new DesiredCapabilities(); + private LoggingPreferences getLoggingPreferences() { LoggingPreferences logPrefs = new LoggingPreferences(); logPrefs.enable(LogType.PERFORMANCE, Level.INFO); logPrefs.enable(LogType.PROFILER, Level.INFO); logPrefs.enable(LogType.BROWSER, Level.INFO); logPrefs.enable(LogType.CLIENT, Level.INFO); logPrefs.enable(LogType.DRIVER, Level.INFO); - caps.setCapability(CapabilityType.LOGGING_PREFS, logPrefs); - return caps; + return logPrefs; } private String getChromeDriverLocation() {