test: fix tests

Author: JoJoJoJoJoJoJo

tests/test_add.py

@@ -9,9 +9,9 @@
 
 def test_add_server(windsurf_manager, monkeypatch):
     """Test add server"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(
         RepositoryManager,
         "_fetch_servers",
@@ -51,9 +51,9 @@ def test_add_server(windsurf_manager, monkeypatch):
 
 def test_add_server_with_missing_arg(windsurf_manager, monkeypatch):
     """Test add server with a missing argument that should be replaced with empty string"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(
         RepositoryManager,
         "_fetch_servers",
@@ -118,6 +118,7 @@ def test_add_server_with_empty_args(windsurf_manager, monkeypatch):
     monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(
         RepositoryManager,
         "_fetch_servers",

tests/test_remove.py

@@ -9,10 +9,10 @@
 def test_remove_server_success(windsurf_manager, monkeypatch):
     """Test successful server removal"""
     # Setup mocks
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
 
     # Mock server info
     mock_server = Mock()
@@ -33,10 +33,10 @@ def test_remove_server_success(windsurf_manager, monkeypatch):
 
 def test_remove_server_not_found(windsurf_manager, monkeypatch):
     """Test removal of non-existent server"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
 
     # Mock server not found
     windsurf_manager.get_server = Mock(return_value=None)
@@ -51,7 +51,7 @@ def test_remove_server_not_found(windsurf_manager, monkeypatch):
 def test_remove_server_unsupported_client(monkeypatch):
     """Test removal with unsupported client"""
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=None))
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="unsupported"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@unsupported"))
 
     runner = CliRunner()
     result = runner.invoke(remove, ["server-test"])
@@ -62,10 +62,10 @@ def test_remove_server_unsupported_client(monkeypatch):
 
 def test_remove_server_cancelled(windsurf_manager, monkeypatch):
     """Test removal when user cancels the confirmation"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
 
     # Mock server info
     mock_server = Mock()
@@ -87,10 +87,10 @@ def test_remove_server_cancelled(windsurf_manager, monkeypatch):
 
 def test_remove_server_failure(windsurf_manager, monkeypatch):
     """Test removal when the removal operation fails"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
 
     # Mock server info
     mock_server = Mock()

tests/test_stash_pop.py

@@ -10,7 +10,7 @@
 def test_stash_server_success(windsurf_manager, monkeypatch):
     """Test successful server stashing"""
     # Setup mocks
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
@@ -49,7 +49,7 @@ def test_stash_server_success(windsurf_manager, monkeypatch):
 
 def test_stash_server_already_stashed(windsurf_manager, monkeypatch):
     """Test stashing an already stashed server"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
@@ -74,7 +74,7 @@ def test_stash_server_already_stashed(windsurf_manager, monkeypatch):
 
 def test_stash_server_remove_failure(windsurf_manager, monkeypatch):
     """Test stashing when server removal fails"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
@@ -103,7 +103,7 @@ def test_stash_server_remove_failure(windsurf_manager, monkeypatch):
 
 def test_stash_server_not_found(windsurf_manager, monkeypatch):
     """Test stashing a non-existent server"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
@@ -126,8 +126,8 @@ def test_stash_server_not_found(windsurf_manager, monkeypatch):
 
 def test_stash_server_unsupported_client(monkeypatch):
     """Test stashing with unsupported client"""
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@unsupported"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=None))
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="unsupported"))
 
     # Mock client config manager
     mock_config_manager = Mock()
@@ -143,7 +143,7 @@ def test_stash_server_unsupported_client(monkeypatch):
 
 def test_pop_server_success(windsurf_manager, monkeypatch):
     """Test successful server restoration"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
@@ -178,7 +178,7 @@ def test_pop_server_success(windsurf_manager, monkeypatch):
 
 def test_pop_server_not_stashed(windsurf_manager, monkeypatch):
     """Test popping a non-stashed server"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
@@ -198,7 +198,7 @@ def test_pop_server_not_stashed(windsurf_manager, monkeypatch):
 
 def test_pop_server_add_failure(windsurf_manager, monkeypatch):
     """Test popping when server addition fails"""
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="windsurf"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@windsurf"))
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=windsurf_manager))
     monkeypatch.setattr(ClientRegistry, "get_client_info", Mock(return_value={"name": "windsurf"}))
     monkeypatch.setattr(ClientRegistry, "get_client_manager", Mock(return_value=windsurf_manager))
@@ -233,7 +233,7 @@ def test_pop_server_add_failure(windsurf_manager, monkeypatch):
 def test_pop_server_unsupported_client(monkeypatch):
     """Test popping with unsupported client"""
     monkeypatch.setattr(ClientRegistry, "get_active_client_manager", Mock(return_value=None))
-    monkeypatch.setattr(ClientRegistry, "get_active_client", Mock(return_value="unsupported"))
+    monkeypatch.setattr(ClientRegistry, "determine_active_scope", Mock(return_value="@unsupported"))
 
     # Mock client config manager
     mock_config_manager = Mock()