Refactor element identifiers from ID to class (#28690)

Closes #24462 Signed-off-by: Dinesh Solanki <15937452+DineshSolanki@users.noreply.github.com>
keycloak · May 7, 2024 · 2172741 · 2172741
1 parent e23db5d
commit 2172741
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/...authn/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnAuthenticatorsList.java b/...authn/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnAuthenticatorsList.java
@@ -37,17 +37,17 @@
  */
 public class WebAuthnAuthenticatorsList {
 
-    @FindBy(id = "kc-webauthn-authenticator")
+    @FindBy(className = "kc-webauthn-authenticator")
     private List<WebElement> authenticators;
 
     public List<WebAuthnAuthenticatorItem> getItems() {
         try {
             List<WebAuthnAuthenticatorItem> items = new ArrayList<>();
             for (WebElement auth : authenticators) {
-                String name = getTextFromElementOrNull(() -> auth.findElement(By.id("kc-webauthn-authenticator-label")));
-                String createdAt = getTextFromElementOrNull(() -> auth.findElement(By.id("kc-webauthn-authenticator-created")));
-                String createdAtLabel = getTextFromElementOrNull(() -> auth.findElement(By.id("kc-webauthn-authenticator-created-label")));
-                String transport = getTextFromElementOrNull(() -> auth.findElement(By.id("kc-webauthn-authenticator-transport")));
+                String name = getTextFromElementOrNull(() -> auth.findElement(By.className("kc-webauthn-authenticator-label")));
+                String createdAt = getTextFromElementOrNull(() -> auth.findElement(By.className("kc-webauthn-authenticator-created")));
+                String createdAtLabel = getTextFromElementOrNull(() -> auth.findElement(By.className("kc-webauthn-authenticator-created-label")));
+                String transport = getTextFromElementOrNull(() -> auth.findElement(By.className("kc-webauthn-authenticator-transport")));
                 items.add(new WebAuthnAuthenticatorItem(name, createdAt, createdAtLabel, transport));
             }
             return items;

diff --git a/...other/webauthn/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnLoginPage.java b/...other/webauthn/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnLoginPage.java
@@ -35,7 +35,7 @@ public class WebAuthnLoginPage extends LanguageComboboxAwarePage {
     @FindBy(id = "authenticateWebAuthnButton")
     private WebElement authenticateButton;
 
-    @FindBy(id = "kc-webauthn-authenticator-label")
+    @FindBy(className = "kc-webauthn-authenticator-label")
     private List<WebElement> authenticatorsLabels;
 
     @Page

diff --git a/themes/src/main/resources/theme/base/login/webauthn-authenticate.ftl b/themes/src/main/resources/theme/base/login/webauthn-authenticate.ftl
@@ -30,19 +30,19 @@
 
                         <div class="${properties.kcFormClass!}">
                             <#list authenticators.authenticators as authenticator>
-                                <div id="kc-webauthn-authenticator" class="${properties.kcSelectAuthListItemClass!}">
+                                <div class="kc-webauthn-authenticator ${properties.kcSelectAuthListItemClass!}">
                                     <div class="${properties.kcSelectAuthListItemIconClass!}">
                                         <i class="${(properties['${authenticator.transports.iconClass}'])!'${properties.kcWebAuthnDefaultIcon!}'} ${properties.kcSelectAuthListItemIconPropertyClass!}"></i>
                                     </div>
                                     <div class="${properties.kcSelectAuthListItemBodyClass!}">
-                                        <div id="kc-webauthn-authenticator-label"
-                                             class="${properties.kcSelectAuthListItemHeadingClass!}">
+                                        <div
+                                             class=" kc-webauthn-authenticator-label ${properties.kcSelectAuthListItemHeadingClass!}">
                                             ${kcSanitize(msg('${authenticator.label}'))?no_esc}
                                         </div>
 
                                         <#if authenticator.transports?? && authenticator.transports.displayNameProperties?has_content>
-                                            <div id="kc-webauthn-authenticator-transport"
-                                                 class="${properties.kcSelectAuthListItemDescriptionClass!}">
+                                            <div
+                                                 class="kc-webauthn-authenticator-transport ${properties.kcSelectAuthListItemDescriptionClass!}">
                                                 <#list authenticator.transports.displayNameProperties as nameProperty>
                                                     <span>${kcSanitize(msg('${nameProperty!}'))?no_esc}</span>
                                                     <#if nameProperty?has_next>
@@ -53,10 +53,10 @@
                                         </#if>
 
                                         <div class="${properties.kcSelectAuthListItemDescriptionClass!}">
-                                            <span id="kc-webauthn-authenticator-created-label">
+                                            <span class="kc-webauthn-authenticator-created-label">
                                                 ${kcSanitize(msg('webauthn-createdAt-label'))?no_esc}
                                             </span>
-                                            <span id="kc-webauthn-authenticator-created">
+                                            <span class="kc-webauthn-authenticator-created">
                                                 ${kcSanitize(authenticator.createdAt)?no_esc}
                                             </span>
                                         </div>