fix : fix Failed test

- make sure it passes all the test

Author: Gopinath-Mahendiran

tests/config/test_keys.py

@@ -3,7 +3,7 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from zulipterminal.config import keys
+from zulipterminal.config import keys 
 
 
 AVAILABLE_COMMANDS = list(keys.key_config.KEY_BINDINGS.keys())
@@ -32,11 +32,11 @@ def test_keys_for_command(valid_command: str) -> None:
 def test_primary_key_for_command(valid_command: str) -> None:
     assert keys.key_config.KEY_BINDINGS[valid_command]["keys"][
         0
-    ] == keys.key_config.key_config.key_config.primary_key_for_command(valid_command)
+    ] == keys.key_config.primary_key_for_command(valid_command)
 
 
 def test_keys_for_command_invalid_command(invalid_command: str) -> None:
-    with pytest.raises(keys.key_config.InvalidCommand):
+    with pytest.raises(keys.InvalidCommand):
         keys.key_config.keys_for_command(invalid_command)
 
 
@@ -53,20 +53,20 @@ def test_keys_for_command_identity(valid_command: str) -> None:
 
 def test_is_command_key_matching_keys(valid_command: str) -> None:
     for key in keys.key_config.keys_for_command(valid_command):
-        assert keys.key_config.key_config.key_config.is_command_key(valid_command, key)
+        assert keys.key_config.is_command_key(valid_command, key)
 
 
 def test_is_command_key_nonmatching_keys(valid_command: str) -> None:
     keys_to_test = USED_KEYS - set(keys.key_config.keys_for_command(valid_command))
     for key in keys_to_test:
-        assert not keys.key_config.key_config.key_config.is_command_key(
+        assert not keys.key_config.is_command_key(
             valid_command, key
         )
 
 
 def test_is_command_key_invalid_command(invalid_command: str) -> None:
-    with pytest.raises(keys.key_config.InvalidCommand):
-        keys.key_config.key_config.key_config.is_command_key(
+    with pytest.raises(keys.InvalidCommand):
+        keys.key_config.is_command_key(
             invalid_command, "esc"
         )  # key doesn't matter
 
@@ -117,7 +117,7 @@ def test_updated_urwid_command_map() -> None:
         v: k for k, v in keys.key_config.ZT_TO_URWID_CMD_MAPPING.items()
     }
     # Check if keys in command map are actually the ones in KEY_BINDINGS
-    for key, urwid_cmd in keys.key_config.command_map._command.items():
+    for key, urwid_cmd in keys.command_map._command.items():
         try:
             zt_cmd = urwid_to_zt_mapping[urwid_cmd]
             assert key in keys.key_config.keys_for_command(zt_cmd)
@@ -162,19 +162,19 @@ def test_display_key_for_urwid_key(urwid_key: str, display_key: str) -> None:
 @pytest.mark.parametrize("command, display_keys", COMMAND_TO_DISPLAY_KEYS)
 def test_display_keys_for_command(command: str, display_keys: List[str]) -> None:
     assert (
-        keys.key_config.key_config.key_config.display_keys_for_command(command)
+        keys.key_config.display_keys_for_command(command)
         == display_keys
     )
 
 
 @pytest.mark.parametrize("command, display_keys", COMMAND_TO_DISPLAY_KEYS)
 def test_primary_display_key_for_command(command: str, display_keys: List[str]) -> None:
     assert (
-        keys.key_config.key_config.key_config.primary_display_key_for_command(command)
+        keys.key_config.primary_display_key_for_command(command)
         == display_keys[0]
     )
 
 
 def test_display_keys_for_command_invalid_command(invalid_command: str) -> None:
-    with pytest.raises(keys.key_config.InvalidCommand):
-        keys.key_config.key_config.key_config.display_keys_for_command(invalid_command)
+    with pytest.raises(keys.InvalidCommand):
+        keys.key_config.display_keys_for_command(invalid_command)

tests/ui_tools/test_boxes.py

@@ -1841,9 +1841,7 @@ class TestPanelSearchBox:
     @pytest.fixture
     def panel_search_box(self, mocker: MockerFixture) -> PanelSearchBox:
         # X is the return from key_config.display_key_config.keys_for_command("UNTESTED_TOKEN")
-        mocker.patch(
-            MODULE + ".key_config.display_key_config.keys_for_command", return_value="X"
-        )
+        mocker.patch(MODULE + ".key_config.display_keys_for_command", return_value="X")
         panel_view = mocker.Mock()
         update_func = mocker.Mock()
         return PanelSearchBox(panel_view, "UNTESTED_TOKEN", update_func)

zulipterminal/config/keys.py

@@ -525,7 +525,7 @@ def primary_key_for_command(self, command: str) -> str:
         """
         Primary Key is the key that will be displayed eg. in the UI
         """
-        return keys_for_command(command).pop(0)
+        return self.keys_for_command(command).pop(0)
 
     URWID_KEY_TO_DISPLAY_KEY_MAPPING = {
         "page up": "PgUp",
@@ -559,7 +559,7 @@ def display_keys_for_command(self, command: str) -> List[str]:
         """
         return [
             self.display_key_for_urwid_key(urwid_key)
-            for urwid_key in keys_for_command(command)
+            for urwid_key in self.keys_for_command(command)
         ]
 
     def primary_display_key_for_command(self, command: str) -> str:
@@ -577,6 +577,14 @@ def commands_for_random_tips(self) -> List[KeyBinding]:
             for key_binding in self.KEY_BINDINGS.values()
             if not key_binding.get("excluded_from_random_tips", False)
         ]
+    def keys_for_command(self,command: str) -> List[str]:
+        """
+        Returns the actual keys for a given mapped command
+        """
+        try:
+            return list(self.KEY_BINDINGS[command]["keys"])
+        except KeyError as exception:
+            raise InvalidCommand(command) from exception
 
 
 # Create a shared instance of KeyConfig
@@ -589,19 +597,8 @@ def initialize_command_map(key_config: KeyConfig) -> None:
     Adds alternate keys for standard urwid navigational commands.
     """
     for zt_cmd, urwid_cmd in key_config.ZT_TO_URWID_CMD_MAPPING.items():
-        for key in keys_for_command(zt_cmd):
+        for key in key_config.keys_for_command(zt_cmd):
             command_map[key] = urwid_cmd
 
-
-def keys_for_command(command: str) -> List[str]:
-    """
-    Returns the actual keys for a given mapped command
-    """
-    try:
-        return list(key_config.KEY_BINDINGS[command]["keys"])
-    except KeyError as exception:
-        raise InvalidCommand(command) from exception
-
-
 # Initialize the command map after the KeyConfig instance is fully initialized
 initialize_command_map(key_config)

zulipterminal/core.py

@@ -113,7 +113,11 @@ def __init__(
                 config.read_file(f, config_file)
             if self.feature_level is None:
                 self.feature_level = self.get_feature_level(config.get("api", "site"))
-        self.terminology = "channel" if int(self.feature_level) > 254 else "stream"
+        if self.feature_level.isdigit():
+            self.feature_level = int(self.feature_level)
+        else:
+            self.feature_level = 0
+        self.terminology = "channel" if self.feature_level > 254 else "stream"
         self.key_config = key_config
         self.key_config.set_terminology(
             self.terminology