Merge pull request #112 from IBM/unit-testing-fix

crivetimihai · web-flow · commit 6f9db42d2f5e · 2025-06-16T23:36:37.000+01:00
Unit testing fix admin tests
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 [![Docker Image](https://img.shields.io/badge/docker-ghcr.io%2Fibm%2Fmcp--context--forge-blue)](https://github.com/ibm/mcp-context-forge/pkgs/container/mcp-context-forge)&nbsp;
 
 
-ContextForge MCP Gateway is a feature-rich gateway & proxy that federates MCP and REST services - unifying discovery, auth, rate-limiting, observability, virtual servers, multi-transport protocols, and an optional Admin UI into one clean endpoint for your AI clients. It runs as a fully compliant MCP server, deployable via PyPI or Docker, and scales to multi-cluster environments on Kubernetes with Redis-backed federation and caching.
+ContextForge MCP Gateway is a feature-rich gateway, proxy and MCP Registry that federates MCP and REST services - unifying discovery, auth, rate-limiting, observability, virtual servers, multi-transport protocols, and an optional Admin UI into one clean endpoint for your AI clients. It runs as a fully compliant MCP server, deployable via PyPI or Docker, and scales to multi-cluster environments on Kubernetes with Redis-backed federation and caching.
 
 ![MCP Gateway](https://ibm.github.io/mcp-context-forge/images/mcpgateway.gif)
 ---
@@ -51,7 +51,7 @@ For a list of upcoming features, check out the [ContextForge MCP Gateway Roadmap
 </details>
 
 <details>
-<summary><strong>🌐 Federation of Peer Gateways</strong></summary>
+<summary><strong>🌐 Federation of Peer Gateways (MCP Registry)</strong></summary>
 
 * Auto-discovers or configures peer gateways (via mDNS or manual)
 * Performs health checks and merges remote registries transparently
diff --git a/mcpgateway/templates/admin.html b/mcpgateway/templates/admin.html
@@ -1214,7 +1214,7 @@ <h3 class="text-lg font-bold mb-4">Add New Prompt</h3>
       <!-- Gateways Panel -->
       <div id="gateways-panel" class="tab-panel hidden">
         <div class="flex justify-between items-center mb-4">
-          <h2 class="text-2xl font-bold">Federated Gateways (MCP)</h2>
+          <h2 class="text-2xl font-bold">Federated Gateways (MCP Registry)</h2>
           <p class="text-sm text-gray-600 mt-1">Gateways are where you register external MCP servers to federate their tools/resources/prompts into your environment.</p>
           <div class="flex items-center">
             <input
diff --git a/tests/unit/mcpgateway/test_admin.py b/tests/unit/mcpgateway/test_admin.py
@@ -74,6 +74,11 @@ def mock_db():
 def mock_request():
     """Create a mock FastAPI request."""
     request = MagicMock(spec=Request)
+
+    # FastAPI's Request always has a .scope dict; many admin helpers read "root_path".
+    request.scope = {"root_path": ""}
+
+    # Pretend form() returns the full set of fields our admin helpers expect
     request.form = AsyncMock(
         return_value={
             "name": "test-name",
@@ -102,12 +107,20 @@ def mock_request():
             "activate": "true",
         }
     )
+
+    # Basic template rendering stub
+    request.app = MagicMock()           # ensure .app exists
+    request.app.state = MagicMock()     # ensure .app.state exists
     request.app.state.templates = MagicMock()
-    request.app.state.templates.TemplateResponse.return_value = HTMLResponse(content="<html></html>")
+    request.app.state.templates.TemplateResponse.return_value = HTMLResponse(
+        content="<html></html>"
+    )
+
     request.query_params = {"include_inactive": "false"}
     return request
 
 
+
 class TestAdminServerRoutes:
     """Test admin routes for server management."""
 
@@ -195,18 +208,15 @@ async def test_admin_toggle_server(self, mock_toggle_status, mock_request, mock_
         assert "/admin#catalog" in result.headers["location"]
 
     @patch.object(ServerService, "delete_server")
-    async def test_admin_delete_server(self, mock_delete_server, mock_db):
+    async def test_admin_delete_server(self, mock_delete_server, mock_request, mock_db):
         """Test deleting a server through admin UI."""
-        # Execute
-        result = await admin_delete_server(1, mock_db, "test-user")
+        result = await admin_delete_server(1, mock_request, mock_db, "test-user")
 
-        # Assert
         mock_delete_server.assert_called_once_with(mock_db, 1)
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
         assert "/admin#catalog" in result.headers["location"]
 
-
 class TestAdminToolRoutes:
     """Test admin routes for tool management."""
 
@@ -309,12 +319,10 @@ async def test_admin_toggle_tool(self, mock_toggle_status, mock_request, mock_db
         assert "/admin#tools" in result.headers["location"]
 
     @patch.object(ToolService, "delete_tool")
-    async def test_admin_delete_tool(self, mock_delete_tool, mock_db):
+    async def test_admin_delete_tool(self, mock_delete_tool, mock_request, mock_db):
         """Test deleting a tool through admin UI."""
-        # Execute
-        result = await admin_delete_tool(1, mock_db, "test-user")
+        result = await admin_delete_tool(1, mock_request, mock_db, "test-user")
 
-        # Assert
         mock_delete_tool.assert_called_once_with(mock_db, 1)
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
@@ -399,12 +407,10 @@ async def test_admin_toggle_resource(self, mock_toggle_status, mock_request, moc
         assert "/admin#resources" in result.headers["location"]
 
     @patch.object(ResourceService, "delete_resource")
-    async def test_admin_delete_resource(self, mock_delete_resource, mock_db):
+    async def test_admin_delete_resource(self, mock_delete_resource, mock_request, mock_db):
         """Test deleting a resource through admin UI."""
-        # Execute
-        result = await admin_delete_resource("/test/resource", mock_db, "test-user")
+        result = await admin_delete_resource("/test/resource", mock_request, mock_db, "test-user")
 
-        # Assert
         mock_delete_resource.assert_called_once_with(mock_db, "/test/resource")
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
@@ -503,12 +509,10 @@ async def test_admin_toggle_prompt(self, mock_toggle_status, mock_request, mock_
         assert "/admin#prompts" in result.headers["location"]
 
     @patch.object(PromptService, "delete_prompt")
-    async def test_admin_delete_prompt(self, mock_delete_prompt, mock_db):
+    async def test_admin_delete_prompt(self, mock_delete_prompt, mock_request, mock_db):
         """Test deleting a prompt through admin UI."""
-        # Execute
-        result = await admin_delete_prompt("test-prompt", mock_db, "test-user")
+        result = await admin_delete_prompt("test-prompt", mock_request, mock_db, "test-user")
 
-        # Assert
         mock_delete_prompt.assert_called_once_with(mock_db, "test-prompt")
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
@@ -589,46 +593,39 @@ async def test_admin_toggle_gateway(self, mock_toggle_status, mock_request, mock
         assert "/admin#gateways" in result.headers["location"]
 
     @patch.object(GatewayService, "delete_gateway")
-    async def test_admin_delete_gateway(self, mock_delete_gateway, mock_db):
+    async def test_admin_delete_gateway(self, mock_delete_gateway, mock_request, mock_db):
         """Test deleting a gateway through admin UI."""
-        # Execute
-        result = await admin_delete_gateway(1, mock_db, "test-user")
+        result = await admin_delete_gateway(1, mock_request, mock_db, "test-user")
 
-        # Assert
         mock_delete_gateway.assert_called_once_with(mock_db, 1)
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
         assert "/admin#gateways" in result.headers["location"]
 
-
 class TestAdminRootRoutes:
     """Test admin routes for root management."""
 
-    @patch.object(RootService, "add_root")
-    async def test_admin_add_root(self, mock_add_root, mock_request, mock_db):
+    @patch("mcpgateway.admin.root_service.add_root", new_callable=AsyncMock)
+    async def test_admin_add_root(self, mock_add_root, mock_request):
         """Test adding a root through admin UI."""
-        # Execute
-        result = await admin_add_root(mock_request, mock_db, "test-user")
+        result = await admin_add_root(mock_request, "test-user")
 
-        # Assert
-        mock_add_root.assert_called_once_with("/test/resource", None)
+        # expect ("uri", "name") → "test-name" comes from the form fixture
+        mock_add_root.assert_called_once_with("/test/resource", "test-name")
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
         assert "/admin#roots" in result.headers["location"]
 
-    @patch.object(RootService, "remove_root")
-    async def test_admin_delete_root(self, mock_remove_root, mock_db):
+    @patch("mcpgateway.admin.root_service.remove_root", new_callable=AsyncMock)
+    async def test_admin_delete_root(self, mock_remove_root, mock_request):
         """Test deleting a root through admin UI."""
-        # Execute
-        result = await admin_delete_root("/test/root", mock_db, "test-user")
+        result = await admin_delete_root("/test/root", mock_request, "test-user")
 
-        # Assert
         mock_remove_root.assert_called_once_with("/test/root")
         assert isinstance(result, RedirectResponse)
         assert result.status_code == 303
         assert "/admin#roots" in result.headers["location"]
 
-
 class TestAdminMetricsRoutes:
     """Test admin routes for metrics management."""
 
