fix tests as per new implementation

Author: navin772

py/test/selenium/webdriver/chrome/fedcm_tests.py

@@ -0,0 +1,137 @@
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import pytest
+
+from selenium.common.exceptions import NoAlertPresentException
+
+
+@pytest.mark.xfail_safari(reason="FedCM not supported")
+@pytest.mark.xfail_firefox(reason="FedCM not supported")
+@pytest.mark.xfail_ie(reason="FedCM not supported")
+class TestFedCM:
+    @pytest.fixture(autouse=True)
+    def setup(self, driver, webserver):
+        driver.get(webserver.where_is("fedcm/fedcm.html", localhost=True))
+        self.dialog = driver.dialog
+
+    def test_no_dialog_title(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.title
+
+    def test_no_dialog_subtitle(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.subtitle
+
+    def test_no_dialog_type(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.type
+
+    def test_no_dialog_get_accounts(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.get_accounts()
+
+    def test_no_dialog_select_account(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.select_account(1)
+
+    def test_no_dialog_cancel(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.cancel()
+
+    def test_no_dialog_click_continue(driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.dialog.click_continue()
+
+    def test_trigger_and_verify_dialog_title(self, driver):
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        assert dialog.title == "Sign in to localhost with localhost"
+
+    def test_trigger_and_verify_dialog_subtitle(self, driver):
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        assert dialog.subtitle is None
+
+    def test_trigger_and_verify_dialog_type(self, driver):
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        assert dialog.type == "AccountChooser"
+
+    def test_trigger_and_verify_account_list(self, driver):
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        accounts = dialog.get_accounts()
+        assert len(accounts) > 0
+        assert accounts[0].name == "John Doe"
+
+    def test_select_account(self, driver):
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        dialog.select_account(1)
+        driver.fedcm_dialog()  # Wait for dialog to become interactable
+        # dialog.click_continue()
+
+    def test_dialog_cancel(self, driver):
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        dialog.cancel()
+        with pytest.raises(NoAlertPresentException):
+            dialog.title
+
+    def test_enable_fedcm_delay(self, driver):
+        driver.fedcm.enable_delay()
+
+    def test_disable_fedcm_delay(self, driver):
+        driver.fedcm.disable_delay()
+
+    def test_fedcm_cooldown_reset(self, driver):
+        driver.fedcm_cooldown()
+
+    def test_fedcm_no_dialog_type_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.dialog_type
+
+    def test_fedcm_no_title_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.title
+
+    def test_fedcm_no_subtitle_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.subtitle
+
+    def test_fedcm_no_account_list_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.account_list()
+
+    def test_fedcm_no_select_account_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.select_account(1)
+
+    def test_fedcm_no_cancel_dialog_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.cancel_dialog()
+
+    def test_fedcm_no_click_continue_present(self, driver):
+        with pytest.raises(NoAlertPresentException):
+            driver.fedcm.click_continue()
+
+    def test_verify_dialog_type_after_cooldown_reset(self, driver):
+        driver.fedcm_cooldown()
+        driver.execute_script("triggerFedCm();")
+        dialog = driver.fedcm_dialog()
+        assert dialog.type == "AccountChooser"

py/test/selenium/webdriver/common/fedcm_tests.py

@@ -16,6 +16,7 @@
 # under the License.
 
 from unittest.mock import Mock
+from unittest.mock import patch
 
 import pytest
 
@@ -28,47 +29,58 @@ def mock_driver():
 
 
 @pytest.fixture
-def dialog(mock_driver):
+def fedcm(mock_driver):
+    fedcm = Mock()
+    mock_driver.fedcm = fedcm
+    return fedcm
+
+
+@pytest.fixture
+def dialog(mock_driver, fedcm):
     return Dialog(mock_driver)
 
 
-def test_click_continue(dialog, mock_driver):
+def test_click_continue(dialog, fedcm):
     dialog.click_continue()
-    mock_driver.click_fedcm_dialog_button.assert_called_once()
+    fedcm.click_continue.assert_called_once()
 
 
-def test_cancel(dialog, mock_driver):
+def test_cancel(dialog, fedcm):
     dialog.cancel()
-    mock_driver.cancel_fedcm_dialog.assert_called_once()
+    fedcm.cancel_dialog.assert_called_once()
 
 
-def test_select_account(dialog, mock_driver):
+def test_select_account(dialog, fedcm):
     dialog.select_account(1)
-    mock_driver.select_fedcm_account.assert_called_once_with(1)
+    fedcm.select_account.assert_called_once_with(1)
 
 
-def test_type(dialog, mock_driver):
-    mock_driver.get_fedcm_dialog_type.return_value = "AccountChooser"
+def test_type(dialog, fedcm):
+    fedcm.dialog_type = "AccountChooser"
     assert dialog.type == "AccountChooser"
 
 
-def test_title(dialog, mock_driver):
-    mock_driver.get_fedcm_title.return_value = "Sign in"
+def test_title(dialog, fedcm):
+    fedcm.title = "Sign in"
     assert dialog.title == "Sign in"
 
 
-def test_subtitle(dialog, mock_driver):
-    mock_driver.get_fedcm_subtitle.return_value = {"subtitle": "Choose an account"}
+def test_subtitle(dialog, fedcm):
+    fedcm.subtitle = {"subtitle": "Choose an account"}
     assert dialog.subtitle == "Choose an account"
 
 
-def test_get_accounts(dialog, mock_driver):
+def test_get_accounts(dialog, fedcm):
     accounts_data = [
         {"name": "Account1", "email": "[email protected]"},
         {"name": "Account2", "email": "[email protected]"},
     ]
-    mock_driver.get_fedcm_account_list.return_value = accounts_data
-    accounts = dialog.get_accounts()
+    fedcm.account_list = accounts_data
+
+    with patch("selenium.webdriver.common.fedcm.account.Account") as MockAccount:
+        MockAccount.return_value = Mock()  # Mock the Account instance
+        accounts = dialog.get_accounts()
+
     assert len(accounts) == 2
     assert accounts[0].name == "Account1"
     assert accounts[0].email == "[email protected]"