refactor(switch): update command func to take separate args

Author: thekaveman

littlepay/commands/switch.py

@@ -1,16 +1,16 @@
 from littlepay.commands.configure import configure
-from littlepay.config import CONFIG_TYPES, Config
+from littlepay.config import Config
 
 
-def switch(switch_type: str, switch_arg: str) -> int:
-    if switch_type not in CONFIG_TYPES:
-        raise ValueError(f"Unsupported type: {switch_type}, must be one of: {', '.join(CONFIG_TYPES)}")
+def switch(env: str = None, participant: str = None) -> int:
+    if not (participant or env):
+        raise ValueError("Unsupported type: provide at least one of participant or env.")
 
     config = Config()
 
-    if switch_type == "env":
-        config.active_env_name = switch_arg
-    elif switch_type == "participant":
-        config.active_participant_id = switch_arg
+    if env:
+        config.active_env_name = env
+    if participant:
+        config.active_participant_id = participant
 
     return configure()

tests/commands/test_switch.py

@@ -26,31 +26,33 @@ def sample_config(custom_config_file: Path) -> dict:
 
 def test_switch_env(mock_commands_config):
     assert Config().active_env_name == "e1"
-    res = switch(switch_type="env", switch_arg="e2")
+    assert Config().active_participant_id == "p1"
+    res = switch(env="e2")
 
     assert res == RESULT_SUCCESS
     mock_commands_config.assert_called_once_with()
-    assert Config().active_env_name != "e1"
     assert Config().active_env_name == "e2"
+    assert Config().active_participant_id == "p1"
 
 
 def test_switch_participant(mock_commands_config):
+    assert Config().active_env_name == "e1"
     assert Config().active_participant_id == "p1"
-    res = switch(switch_type="participant", switch_arg="p2")
+    res = switch(participant="p2")
 
     assert res == RESULT_SUCCESS
     mock_commands_config.assert_called_once_with()
-    assert Config().active_participant_id != "p1"
+    assert Config().active_env_name == "e1"
     assert Config().active_participant_id == "p2"
 
 
-def test_switch_unrecognized_type(mock_commands_config):
-    env = Config().active_env_name
-    participant = Config().active_participant_id
+def test_switch_both(mock_commands_config):
+    assert Config().active_env_name == "e1"
+    assert Config().active_participant_id == "p1"
 
-    with pytest.raises(ValueError):
-        switch(switch_type="unrecognized", switch_arg="new_value")
+    res = switch(env="e2", participant="p2")
 
-    assert Config().active_env_name == env
-    assert Config().active_participant_id == participant
-    assert mock_commands_config.call_count == 0
+    assert res == RESULT_SUCCESS
+    mock_commands_config.assert_called_once_with()
+    assert Config().active_env_name == "e2"
+    assert Config().active_participant_id == "p2"