test: Update tests according to new changes.

Author: Gopinath-Mahendiran

tests/cli/test_run.py

@@ -398,6 +398,7 @@ def test_main_cannot_write_zuliprc_given_good_credentials(
 
     # This is default base path to use
     zuliprc_path = os.path.join(str(tmp_path), path_to_use)
+    zuliprc_file = os.path.join(zuliprc_path, "zuliprc")
     monkeypatch.setenv("HOME", zuliprc_path)
 
     # Give some arbitrary input and fake that it's always valid
@@ -412,12 +413,18 @@ def test_main_cannot_write_zuliprc_given_good_credentials(
     captured = capsys.readouterr()
     lines = captured.out.strip().split("\n")
 
-    expected_line = (
-        "\x1b[91m"
-        f"{expected_exception}: zuliprc could not be created "
-        f"at {os.path.join(zuliprc_path, 'zuliprc')}"
-        "\x1b[0m"
-    )
+    if expected_exception == "FileNotFoundError":
+        expected_error = (
+            f"could not create {zuliprc_file} "
+            f"([Errno 2] No such file or directory: '{zuliprc_file}')"
+        )
+    else:  # PermissionError
+        expected_error = (
+            f"could not create {zuliprc_file} "
+            f"([Errno 13] Permission denied: '{zuliprc_file}')"
+        )
+
+    expected_line = f"\x1b[91m{expected_exception}: {expected_error}\x1b[0m"
     assert lines[-1] == expected_line
 
 
@@ -573,38 +580,29 @@ def test_exit_with_error(
 def test__write_zuliprc__success(
     tmp_path: Path, id: str = "id", key: str = "key", url: str = "url"
 ) -> None:
-    path = os.path.join(str(tmp_path), "zuliprc")
-
-    error_message = _write_zuliprc(path, server_url=url, login_id=id)
+    """Test successful creation of zuliprc and zulip_key files."""
+    path = tmp_path / "zuliprc"
+    key_path = tmp_path / "zulip_key"
+
+    error_message = _write_zuliprc(
+        to_path=str(path),
+        key_path=str(key_path),
+        login_id=id,
+        api_key=key,
+        server_url=url,
+    )
 
     assert error_message == ""
 
-    expected_contents = (
-        f"[api]\nemail={id}\n"
-        f"# Fill the passcmd field with a command that outputs the API key.\n"
-        f"# The API key is temporarily stored in the 'zulip_key' file at "
-        f"{os.path.dirname(os.path.abspath(path))}."
-        f"\n# After storing the key in a password manager, replace the cmd.\n"
-        f"passcmd=cat zulip_key\nsite={url}"
-    )
+    expected_contents = f"[api]\nemail={id}\npasscmd=cat zulip_key\nsite={url}"
     with open(path) as f:
         assert f.read() == expected_contents
 
-    assert stat.filemode(os.stat(path).st_mode)[-6:] == 6 * "-"
-
+    with open(key_path) as f:
+        assert f.read() == key
 
-def test__write_zuliprc__fail_file_exists(
-    minimal_zuliprc: str,
-    tmp_path: Path,
-    id: str = "id",
-    key: str = "key",
-    url: str = "url",
-) -> None:
-    path = os.path.join(str(tmp_path), "zuliprc")
-
-    error_message = _write_zuliprc(path, server_url=url, login_id=id)
-
-    assert error_message == "zuliprc already exists at " + path
+    assert stat.filemode(os.stat(path).st_mode)[-6:] == 6 * "-"
+    assert stat.filemode(os.stat(key_path).st_mode)[-6:] == "------"
 
 
 @pytest.mark.parametrize(

tests/conftest.py

@@ -17,7 +17,6 @@
     keys_for_command,
     primary_key_for_command,
 )
-from zulipterminal.core import Controller
 from zulipterminal.helper import (
     CustomProfileData,
     Index,
@@ -53,11 +52,6 @@ def no_asynch(mocker: MockerFixture) -> None:
     mocker.patch("zulipterminal.helper.asynch")
 
 
-@pytest.fixture(autouse=True)
-def dummy_api_key(monkeypatch: pytest.MonkeyPatch) -> None:
-    monkeypatch.setattr(Controller, "get_api_key", lambda self, value: "dummy_api_key")
-
-
 # --------------- Controller Fixtures -----------------------------------------
 
 

tests/core/test_core.py

@@ -43,7 +43,6 @@ def controller(self, mocker: MockerFixture) -> Controller:
         )
 
         # Mock get_api_key to return a dummy value
-        mocker.patch.object(Controller, "get_api_key", return_value="dummy_api_key")
 
         self.config_file = "path/to/zuliprc"
         self.theme_name = "zt_dark"
@@ -83,7 +82,6 @@ def test_initialize_controller(
         self.client.assert_called_once_with(
             config_file=self.config_file,
             client="ZulipTerminal/" + ZT_VERSION + " " + platform(),
-            api_key="dummy_api_key",  # Add this line
         )
         self.model.assert_called_once_with(controller)
         self.view.assert_called_once_with(controller)

tests/platform_code/test_platform_code.py

@@ -16,6 +16,7 @@
 @pytest.mark.parametrize(
     "platform, is_notification_sent",
     [
+        # platform: Literal["WSL", "MacOS", "Linux", "unsupported"]
         pytest.param(
             "WSL",
             True,
@@ -71,6 +72,8 @@ def test_notify_quotes(
     assert len(params) == 1  # One external run call
     assert len(params[0][0][0]) == cmd_length
 
+    # NOTE: If there is a quoting error, we may get a ValueError too
+
 
 @pytest.mark.parametrize(
     "platform, expected_return_code",
@@ -105,14 +108,3 @@ def test_normalized_file_path(
 ) -> None:
     mocker.patch(MODULE + ".PLATFORM", platform)
     assert normalized_file_path(path) == expected_path
-
-
-@pytest.mark.parametrize("button_count", [1, 2, 3])  # Add parameterization
-def test_button_selection(mocker: MockerFixture, button_count: int) -> None:
-    """Test button selection in popups."""
-    buttons = [mocker.Mock(selected=False) for _ in range(button_count)]
-    buttons[0].selected = True  # Select the first button by default
-
-    assert any(
-        button.selected for button in buttons
-    ), "At least one button should be selected"