Ensure tests pass in other languages

pujagani · pujagani · commit 8a970dc2c4f0 · 2024-12-23T18:27:22.000+05:30
diff --git a/common/src/web/fedcm/fedcm.html b/common/src/web/fedcm/fedcm.html
@@ -1,37 +1,20 @@
 <!DOCTYPE html>
-<html>
-<head>
-    <title>FedCM Example</title>
-</head>
-<body>
-    <button id="triggerButton" onclick="triggerFedCm()">Trigger FedCM</button>
-    <div id="result"></div>
+<script>
 
-    <script>
-        // Use a relative path for the configURL
-        let configURL = `https://${location.host}/fedcm/config.json`;
-        console.log(configURL)
-        let result = null;
+let configURL = `http://${location.host}/fedcm/config.json`;
+let promise = null;
 
-        async function triggerFedCm() {
-            console.log("Config URL:", configURL);
-            try {
-                let promise = await navigator.credentials.get({
-                    identity: {
-                        providers: [{
-                            configURL: configURL,
-                            clientId: '1',
-                        }]
-                    }
-                });
-                result = promise;
-                document.getElementById('result').innerText = JSON.stringify(result);
-            } catch (error) {
-                console.error("FedCM Error:", error);
-                result = { error: error.message };
-                document.getElementById('result').innerText = JSON.stringify(result);
-            }
-        }
-    </script>
-</body>
-</html>
+function triggerFedCm() {
+  console.log(configURL);
+  promise = navigator.credentials.get({
+    identity: {
+      providers: [{
+        configURL: configURL,
+        clientId: '1',
+      }]
+    }
+  });
+  return promise;
+}
+
+</script>
diff --git a/java/test/org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementTest.java b/java/test/org/openqa/selenium/federatedcredentialmanagement/FederatedCredentialManagementTest.java
@@ -23,30 +23,25 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.openqa.selenium.testing.drivers.Browser.CHROME;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.time.Duration;
 import java.util.List;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.NoAlertPresentException;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.openqa.selenium.environment.InProcessTestEnvironment;
 import org.openqa.selenium.environment.webserver.AppServer;
 import org.openqa.selenium.support.ui.WebDriverWait;
-import org.openqa.selenium.testing.NeedsSecureServer;
 
-@NeedsSecureServer
 class FederatedCredentialManagementTest {
 
   private HasFederatedCredentialManagement fedcmDriver;
   private WebDriver localDriver;
-  InProcessTestEnvironment environment = new InProcessTestEnvironment(true);
+  InProcessTestEnvironment environment = new InProcessTestEnvironment(false);
   AppServer appServer = environment.getAppServer();
 
   @BeforeEach
@@ -57,7 +52,7 @@ public void setup() {
 
     assumeThat(localDriver).isInstanceOf(HasFederatedCredentialManagement.class);
     fedcmDriver = (HasFederatedCredentialManagement) localDriver;
-    localDriver.get(appServer.whereIsSecure("/fedcm/fedcm.html"));
+    localDriver.get(appServer.whereIs("/fedcm/fedcm.html"));
   }
 
   @AfterEach
@@ -74,23 +69,12 @@ private void waitForDialog() {
                 != null);
   }
 
-  private int getSecurePort() {
-    String urlString = appServer.whereIsSecure("/");
-    try {
-      return new URL(urlString).getPort();
-    } catch (MalformedURLException ex) {
-      // This should not happen.
-      return 0;
-    }
-  }
-
   @Test
   void testDismissDialog() {
     fedcmDriver.setDelayEnabled(false);
     assertNull(fedcmDriver.getFederatedCredentialManagementDialog());
 
-    WebElement triggerButton = localDriver.findElement(By.id("triggerButton"));
-    triggerButton.click();
+    ((JavascriptExecutor) localDriver).executeScript("triggerFedCm();");
 
     waitForDialog();
 
@@ -111,8 +95,7 @@ void testDismissDialog() {
   void testSelectAccount() {
     assertNull(fedcmDriver.getFederatedCredentialManagementDialog());
 
-    WebElement triggerButton = localDriver.findElement(By.id("triggerButton"));
-    triggerButton.click();
+    ((JavascriptExecutor) localDriver).executeScript("triggerFedCm();");
 
     waitForDialog();
 
@@ -132,8 +115,7 @@ void testSelectAccount() {
   void testGetAccounts() {
     assertNull(fedcmDriver.getFederatedCredentialManagementDialog());
 
-    WebElement triggerButton = localDriver.findElement(By.id("triggerButton"));
-    triggerButton.click();
+    ((JavascriptExecutor) localDriver).executeScript("triggerFedCm();");
 
     waitForDialog();
 
diff --git a/py/test/selenium/webdriver/common/fedcm_tests.py b/py/test/selenium/webdriver/common/fedcm_tests.py
@@ -24,8 +24,6 @@
 @pytest.mark.xfail_firefox(reason="FedCM not supported")
 @pytest.mark.xfail_ie(reason="FedCM not supported")
 @pytest.mark.xfail_remote(reason="FedCM not supported, since remote uses Firefox")
-@pytest.mark.xfail_chrome(reason="FedCM supported but test suite needs to support secure webserver")
-@pytest.mark.xfail_edge(reason="FedCM supported but test suite needs to support secure webserver")
 class TestFedCM:
     @pytest.fixture(autouse=True)
     def setup(self, driver, webserver):
diff --git a/rb/spec/integration/selenium/webdriver/fedcm_spec.rb b/rb/spec/integration/selenium/webdriver/fedcm_spec.rb
@@ -22,7 +22,7 @@
 module Selenium
   module WebDriver
     module FedCM
-      describe FedCM, exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: [ ]}] do
+      describe FedCM, exclusive: [{bidi: false, reason: 'Not yet implemented with BiDi'}, {browser: %i[chrome edge]}] do
         let(:dialog) { driver.fedcm_dialog }
 
         before do
