From ce6c12ec7f6ad76a9e61a21645451211e005144a Mon Sep 17 00:00:00 2001 From: Francisco Javier Fernandez Gonzalez Date: Fri, 20 Sep 2024 11:32:27 +0200 Subject: [PATCH] Adapt the OicAuthPluginTest to the changes in the describables --- .../jenkinsci/test/acceptance/po/OicAuthSecurityRealm.java | 6 +++--- src/test/java/plugins/OicAuthPluginTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jenkinsci/test/acceptance/po/OicAuthSecurityRealm.java b/src/main/java/org/jenkinsci/test/acceptance/po/OicAuthSecurityRealm.java index 091c1ab7d..01ff225e4 100644 --- a/src/main/java/org/jenkinsci/test/acceptance/po/OicAuthSecurityRealm.java +++ b/src/main/java/org/jenkinsci/test/acceptance/po/OicAuthSecurityRealm.java @@ -15,9 +15,9 @@ public void configureClient(String clientId, String clientSecret) { control("clientSecret").set(clientSecret); } - public void setAutomaticConfiguration(String wellKnownEndpoint) { - control(by.radioButton("Automatic configuration")).click(); - control("wellKnownOpenIDConfigurationUrl").set(wellKnownEndpoint); + public void setWellKnownEndpoint(String wellKnownEndpoint) { + control("").select("Discovery via well-known endpoint"); // Select doesn't have the relative path, directly path=/securityRealm/ + control("serverConfiguration/wellKnownOpenIDConfigurationUrl").set(wellKnownEndpoint); } public void setLogoutFromOpenidProvider(boolean logout) { diff --git a/src/test/java/plugins/OicAuthPluginTest.java b/src/test/java/plugins/OicAuthPluginTest.java index 6b1a0eced..38f1efc62 100644 --- a/src/test/java/plugins/OicAuthPluginTest.java +++ b/src/test/java/plugins/OicAuthPluginTest.java @@ -206,7 +206,7 @@ private void configureRealm() { sc.open(); OicAuthSecurityRealm securityRealm = sc.useRealm(OicAuthSecurityRealm.class); securityRealm.configureClient(CLIENT, CLIENT); - securityRealm.setAutomaticConfiguration( + securityRealm.setWellKnownEndpoint( String.format("%s/realms/%s/.well-known/openid-configuration", keycloakUrl, REALM)); securityRealm.setLogoutFromOpenidProvider(true); securityRealm.setPostLogoutUrl(jenkins.url("OicLogout").toExternalForm());