From 64a36c009dd0df72a664204ecae06355656d1694 Mon Sep 17 00:00:00 2001
From: Pedro Ruivo <pruivo@users.noreply.github.com>
Date: Wed, 7 Jan 2026 15:32:00 +0000
Subject: [PATCH] Fix Cluster Compatibility Tests

Closes #45221

Signed-off-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
Co-authored-by: Pedro Ruivo <1492066+pruivo@users.noreply.github.com>
---
 .../testframework/clustering/LoadBalancerSupplier.java   | 9 +++++++++
 .../tests/compatibility/ClusteredOAuthClientTest.java    | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancerSupplier.java b/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancerSupplier.java
index 2010403be91..491ae8fc5fd 100644
--- a/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancerSupplier.java
+++ b/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancerSupplier.java
@@ -1,6 +1,10 @@
 package org.keycloak.testframework.clustering;
 
+import java.util.List;
+
 import org.keycloak.testframework.annotations.InjectLoadBalancer;
+import org.keycloak.testframework.injection.DependenciesBuilder;
+import org.keycloak.testframework.injection.Dependency;
 import org.keycloak.testframework.injection.InstanceContext;
 import org.keycloak.testframework.injection.RequestedInstance;
 import org.keycloak.testframework.injection.Supplier;
@@ -42,4 +46,9 @@ public class LoadBalancerSupplier implements Supplier<LoadBalancer, InjectLoadBa
     public KeycloakServerConfigBuilder intercept(KeycloakServerConfigBuilder serverConfig, InstanceContext<LoadBalancer, InjectLoadBalancer> instanceContext) {
         return serverConfig.option("hostname", LoadBalancer.HOSTNAME);
     }
+
+    @Override
+    public List<Dependency> getDependencies(RequestedInstance<LoadBalancer, InjectLoadBalancer> instanceContext) {
+        return DependenciesBuilder.create(KeycloakServer.class).build();
+    }
 }
diff --git a/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java b/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java
index 380c98fdaee..c34cd2b41f8 100644
--- a/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java
+++ b/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java
@@ -10,6 +10,7 @@ import org.keycloak.testframework.realm.ManagedUser;
 import org.keycloak.testframework.realm.UserConfig;
 import org.keycloak.testframework.realm.UserConfigBuilder;
 import org.keycloak.testframework.ui.annotations.InjectWebDriver;
+import org.keycloak.testframework.ui.webdriver.ManagedWebDriver;
 import org.keycloak.testsuite.util.oauth.AccessTokenResponse;
 import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse;
 
@@ -18,7 +19,6 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
 
 @KeycloakIntegrationTest
@@ -34,13 +34,13 @@ public class ClusteredOAuthClientTest {
     OAuthClient oauth;
 
     @InjectWebDriver
-    WebDriver driver;
+    ManagedWebDriver driver;
 
     @AfterEach
     public void cleanup() {
         loadBalancer.node(0);
-        driver.navigate().to("about:blank");
-        if (driver instanceof HtmlUnitDriver htmlUnitDriver) {
+        driver.open("about:blank");
+        if (driver.driver() instanceof HtmlUnitDriver htmlUnitDriver) {
             WebClient webClient = htmlUnitDriver.getWebClient();
             webClient.getCache().clear();
             webClient.getCookieManager().clearCookies();