fix implementation and unit tests

Author: navin772

py/selenium/webdriver/common/driver_extensions/has_fedcm_dialog.py

@@ -33,7 +33,7 @@ def enable_fedcm_delay(self, enable):
         privacy reasons. This method allows turning it off to let tests
         run faster where this is not relevant.
         """
-        self.execute("setFedCmDelay", {"enabled": enable})
+        self.set_fedcm_delay(enable)
 
     def fedcm_cooldown(self):
         """Resets the FedCm dialog cooldown.

py/selenium/webdriver/common/fedcm/dialog.py

@@ -46,7 +46,6 @@ def subtitle(self) -> Optional[str]:
         result = self._driver.get_fedcm_subtitle()
         return result.get("subtitle") if result else None
 
-    @property
     def get_accounts(self) -> List[Account]:
         """Gets the list of accounts shown in the dialog."""
         accounts = self._driver.get_fedcm_account_list()

py/selenium/webdriver/remote/command.py

@@ -127,8 +127,8 @@ class Command:
     GET_FEDCM_TITLE: str = "getFedcmTitle"
     GET_FEDCM_DIALOG_TYPE: str = "getFedcmDialogType"
     GET_FEDCM_ACCOUNT_LIST: str = "getFedcmAccountList"
+    SELECT_FEDCM_ACCOUNT: str = "selectFedcmAccount"
     CLICK_FEDCM_DIALOG_BUTTON: str = "clickFedcmDialogButton"
     CANCEL_FEDCM_DIALOG: str = "cancelFedcmDialog"
-    SELECT_FEDCM_ACCOUNT: str = "selectFedcmAccount"
     SET_FEDCM_DELAY: str = "setFedcmDelay"
     RESET_FEDCM_COOLDOWN: str = "resetFedcmCooldown"

py/selenium/webdriver/remote/webdriver.py

@@ -1224,29 +1224,33 @@ def delete_downloadable_files(self) -> None:
         self.execute(Command.DELETE_DOWNLOADABLE_FILES)
 
     # Federated Credential Management (FedCM)
-    def cancel_fedcm_dialog(self) -> None:
-        """Cancels/dismisses the FedCM dialog."""
-        self.execute(Command.CANCEL_FEDCM_DIALOG)
-
-    def select_fedcm_account(self, index: int) -> None:
-        """Selects an account from the dialog by index."""
-        self.execute(Command.SELECT_FEDCM_ACCOUNT, {"accountIndex": index})
-
-    def get_fedcm_dialog_type(self):
-        """Gets the type of the dialog currently being shown."""
-        return self.execute(Command.GET_FEDCM_DIALOG_TYPE)
-
     def get_fedcm_title(self) -> str:
         """Gets the title of the dialog."""
-        return self.execute(Command.GET_FEDCM_TITLE).get("title")
+        return self.execute(Command.GET_FEDCM_TITLE)["value"].get("title")
 
     def get_fedcm_subtitle(self) -> Optional[str]:
         """Gets the subtitle of the dialog."""
-        return self.execute(Command.GET_FEDCM_TITLE).get("subtitle")
+        return self.execute(Command.GET_FEDCM_TITLE)["value"].get("subtitle")
+
+    def get_fedcm_dialog_type(self):
+        """Gets the type of the dialog currently being shown."""
+        return self.execute(Command.GET_FEDCM_DIALOG_TYPE).get("value")
 
     def get_fedcm_account_list(self):
         """Gets the list of accounts shown in the dialog."""
-        return self.execute(Command.GET_FEDCM_ACCOUNT_LIST)
+        return self.execute(Command.GET_FEDCM_ACCOUNT_LIST).get("value")
+
+    def select_fedcm_account(self, index: int) -> None:
+        """Selects an account from the dialog by index."""
+        self.execute(Command.SELECT_FEDCM_ACCOUNT, {"accountIndex": index})
+
+    def click_fedcm_dialog_button(self) -> None:
+        """Clicks the continue button in the dialog."""
+        self.execute(Command.CLICK_FEDCM_DIALOG_BUTTON, {"dialogButton": "ConfirmIdpLoginContinue"})
+
+    def cancel_fedcm_dialog(self) -> None:
+        """Cancels/dismisses the FedCM dialog."""
+        self.execute(Command.CANCEL_FEDCM_DIALOG)
 
     def set_fedcm_delay(self, enabled: bool) -> None:
         """Disables the promise rejection delay for FedCM.
@@ -1267,7 +1271,3 @@ def reset_fedcm_cooldown(self) -> None:
         can be triggered again immediately.
         """
         self.execute(Command.RESET_FEDCM_COOLDOWN)
-
-    def click_fedcm_dialog_button(self) -> None:
-        """Clicks the continue button in the dialog."""
-        self.execute(Command.CLICK_FEDCM_DIALOG_BUTTON, {"dialogButton": "ConfirmIdpLoginContinue"})

py/test/unit/selenium/webdriver/common/fedcm/dialog_tests.py

@@ -34,31 +34,31 @@ def dialog(mock_driver):
 
 def test_click_continue(dialog, mock_driver):
     dialog.click_continue()
-    mock_driver.execute.assert_called_with("clickFedCmDialogButton", {"dialogButton": "ConfirmIdpLoginContinue"})
+    mock_driver.click_fedcm_dialog_button.assert_called_once()
 
 
 def test_cancel(dialog, mock_driver):
     dialog.cancel()
-    mock_driver.execute.assert_called_with("cancelFedCmDialog")
+    mock_driver.cancel_fedcm_dialog.assert_called_once()
 
 
 def test_select_account(dialog, mock_driver):
     dialog.select_account(1)
-    mock_driver.execute.assert_called_with("selectFedCmAccount", {"accountIndex": 1})
+    mock_driver.select_fedcm_account.assert_called_once_with(1)
 
 
 def test_type(dialog, mock_driver):
-    mock_driver.execute.return_value = {"value": "AccountChooser"}
+    mock_driver.get_fedcm_dialog_type.return_value = "AccountChooser"
     assert dialog.type == "AccountChooser"
 
 
 def test_title(dialog, mock_driver):
-    mock_driver.execute.return_value = {"title": "Sign in"}
+    mock_driver.get_fedcm_title.return_value = "Sign in"
     assert dialog.title == "Sign in"
 
 
 def test_subtitle(dialog, mock_driver):
-    mock_driver.execute.return_value = {"subtitle": "Choose an account"}
+    mock_driver.get_fedcm_subtitle.return_value = {"subtitle": "Choose an account"}
     assert dialog.subtitle == "Choose an account"
 
 
@@ -67,8 +67,10 @@ def test_get_accounts(dialog, mock_driver):
         {"name": "Account1", "email": "[email protected]"},
         {"name": "Account2", "email": "[email protected]"},
     ]
-    mock_driver.execute.return_value = accounts_data
+    mock_driver.get_fedcm_account_list.return_value = accounts_data
     accounts = dialog.get_accounts()
     assert len(accounts) == 2
     assert accounts[0].name == "Account1"
     assert accounts[0].email == "[email protected]"
+    assert accounts[1].name == "Account2"
+    assert accounts[1].email == "[email protected]"