Fix API path in tests

Author: janheinrichmerker

tests/browser/aql_services/test_aql_service_view_options.py

@@ -51,7 +51,7 @@ async def test_raw_view_always_available(client):
     raw_view = next(v for v in result["views"] if v["type"] == "raw")
     assert raw_view["available"] is True
     assert raw_view["url"] is not None
-    assert "/api/serps/1" in raw_view["url"]
+    assert "/serps/1" in raw_view["url"]
 
 
 @pytest.mark.asyncio

tests/browser/search_router/test_search_router_archive_detail.py

@@ -6,8 +6,8 @@
 
 @pytest.mark.asyncio
 async def test_list_archives(client: TestClient, mock_elasticsearch):
-    """Test GET /api/archives"""
-    response = client.get("/api/archives")
+    """Test GET /archives"""
+    response = client.get("/archives")
 
     # Should succeed
     assert response.status_code == 200
@@ -20,8 +20,8 @@ async def test_list_archives(client: TestClient, mock_elasticsearch):
 
 @pytest.mark.asyncio
 async def test_list_archives_with_limit(client: TestClient, mock_elasticsearch):
-    """Test GET /api/archives with limit parameter"""
-    response = client.get("/api/archives?limit=50")
+    """Test GET /archives with limit parameter"""
+    response = client.get("/archives?limit=50")
 
     assert response.status_code == 200
     data = response.json()
@@ -32,8 +32,8 @@ async def test_list_archives_with_limit(client: TestClient, mock_elasticsearch):
 
 @pytest.mark.asyncio
 async def test_list_archives_invalid_limit(client: TestClient, mock_elasticsearch):
-    """Test GET /api/archives with invalid limit"""
-    response = client.get("/api/archives?limit=0")
+    """Test GET /archives with invalid limit"""
+    response = client.get("/archives?limit=0")
 
     # Should fail validation
     assert response.status_code == 422
@@ -44,7 +44,7 @@ async def test_list_archives_returns_archive_structure(
     client: TestClient, mock_elasticsearch
 ):
     """Test that list_archives returns proper archive metadata"""
-    response = client.get("/api/archives")
+    response = client.get("/archives")
 
     assert response.status_code == 200
     data = response.json()
@@ -71,7 +71,7 @@ async def test_list_archives_returns_archive_structure(
 @pytest.mark.asyncio
 async def test_internet_archive_details(client: TestClient, mock_elasticsearch):
     """Test that Internet Archive is correctly identified in list"""
-    response = client.get("/api/archives")
+    response = client.get("/archives")
 
     assert response.status_code == 200
     data = response.json()
@@ -91,7 +91,7 @@ async def test_internet_archive_details(client: TestClient, mock_elasticsearch):
 @pytest.mark.asyncio
 async def test_archive_list_sorted_by_count(client: TestClient, mock_elasticsearch):
     """Test that archives are sorted by SERP count (descending)"""
-    response = client.get("/api/archives")
+    response = client.get("/archives")
 
     assert response.status_code == 200
     data = response.json()

tests/browser/search_router/test_search_router_archive_statistics.py

@@ -38,9 +38,9 @@ async def search(self, *args, **kwargs):
 
 
 def test_archive_statistics_router(client, mock_archive_statistics_client):
-    """Test GET /api/archives/{archive_id}/statistics"""
+    """Test GET /archives/{archive_id}/statistics"""
     archive_id = "https://web.archive.org/web"
-    resp = client.get(f"/api/archives/{archive_id}/statistics")
+    resp = client.get(f"/archives/{archive_id}/statistics")
 
     assert resp.status_code == 200
     data = resp.json()
@@ -61,7 +61,7 @@ def test_archive_statistics_with_params(client, mock_archive_statistics_client):
     """Test archive statistics with custom parameters"""
     archive_id = "https://web.archive.org/web"
     resp = client.get(
-        f"/api/archives/{archive_id}/statistics?interval=week&last_n_months=12"
+        f"/archives/{archive_id}/statistics?interval=week&last_n_months=12"
     )
     assert resp.status_code == 200
     data = resp.json()
@@ -74,7 +74,7 @@ def test_archive_statistics_with_params(client, mock_archive_statistics_client):
 def test_archive_statistics_default_interval(client, mock_archive_statistics_client):
     """Test that default interval is 'month'"""
     archive_id = "https://web.archive.org/web"
-    resp = client.get(f"/api/archives/{archive_id}/statistics")
+    resp = client.get(f"/archives/{archive_id}/statistics")
     assert resp.status_code == 200
     data = resp.json()
 
@@ -90,7 +90,7 @@ async def search(self, *args, **kwargs):
 
     with patch("archive_query_log.browser.services.aql_service.get_es_client") as mock_get_client:
         mock_get_client.return_value = MockEmptyClient()
-        resp = client.get("/api/archives/https://nonexistent.archive/web/statistics")
+        resp = client.get("/archives/https://nonexistent.archive/web/statistics")
 
         # Should return 404 because the service returns None when serp_count is 0
         assert resp.status_code == 404
@@ -102,7 +102,7 @@ def test_archive_statistics_with_different_intervals(
     """Test archive statistics with different interval values"""
     archive_id = "https://web.archive.org/web"
     for interval in ["day", "week", "month"]:
-        resp = client.get(f"/api/archives/{archive_id}/statistics?interval={interval}")
+        resp = client.get(f"/archives/{archive_id}/statistics?interval={interval}")
         assert resp.status_code == 200
         data = resp.json()
         assert data["archive_id"] == archive_id
@@ -111,7 +111,7 @@ def test_archive_statistics_with_different_intervals(
 def test_archive_statistics_structure(client, mock_archive_statistics_client):
     """Test that archive statistics response has correct structure"""
     archive_id = "https://web.archive.org/web"
-    resp = client.get(f"/api/archives/{archive_id}/statistics")
+    resp = client.get(f"/archives/{archive_id}/statistics")
 
     assert resp.status_code == 200
     data = resp.json()

tests/browser/search_router/test_search_router_archives.py

@@ -1,8 +1,8 @@
-"""Tests for Archives endpoints (/api/archives and /api/archive/{id})"""
+"""Tests for Archives endpoints (/archives and /archive/{id})"""
 
 
 def test_get_all_archives(client):
-    response = client.get("/api/archives")
+    response = client.get("/archives")
     assert response.status_code == 200
     data = response.json()
     assert "total" in data
@@ -11,7 +11,7 @@ def test_get_all_archives(client):
 
 
 def test_get_all_archives_with_size_limit(client):
-    response = client.get("/api/archives?size=1")
+    response = client.get("/archives?size=1")
     assert response.status_code == 200
     data = response.json()
     assert len(data["archives"]) == 1

tests/browser/search_router/test_search_router_archives_detail_canonical.py

@@ -1,6 +1,6 @@
 """Tests for the canonical archive detail endpoint using memento_api_url.
 
-Covers the new route: /api/archives/{archive_id:path}
+Covers the new route: /archives/{archive_id:path}
 """
 
 from urllib.parse import quote
@@ -13,7 +13,7 @@ async def test_archive_detail_canonical_success(client: TestClient):
     archive_id = "https://web.archive.org/web"
     encoded = quote(archive_id, safe="")
 
-    resp = client.get(f"/api/archives/{encoded}")
+    resp = client.get(f"/archives/{encoded}")
     assert resp.status_code == 200
     data = resp.json()
 
@@ -41,6 +41,6 @@ async def test_archive_detail_canonical_not_found(client: TestClient):
     archive_id = "https://unknown.example.org"
     encoded = quote(archive_id, safe="")
 
-    resp = client.get(f"/api/archives/{encoded}")
+    resp = client.get(f"/archives/{encoded}")
     assert resp.status_code == 404
     assert resp.json()["detail"] == "No results found"

tests/browser/search_router/test_search_router_archives_edge_cases.py

@@ -6,12 +6,12 @@
 def test_list_archives_invalid_size_parameter(client):
     """Test that invalid size parameter returns 422 error"""
     # Size too small
-    response = client.get("/api/archives?size=0")
+    response = client.get("/archives?size=0")
     assert response.status_code == 422
     assert "Invalid size parameter" in response.json()["detail"]
 
     # Size too large
-    response = client.get("/api/archives?size=1001")
+    response = client.get("/archives?size=1001")
     assert response.status_code == 422
     assert "Invalid size parameter" in response.json()["detail"]
 
@@ -30,7 +30,7 @@ def test_list_archives_with_size_alias(client):
         "archive_query_log.browser.routers.search.aql_service.list_all_archives",
         new=AsyncMock(return_value=mock_result),
     ):
-        response = client.get("/api/archives?size=2")
+        response = client.get("/archives?size=2")
         assert response.status_code == 200
         data = response.json()
         assert len(data["archives"]) == 2

tests/browser/search_router/test_search_router_compare.py

@@ -40,7 +40,7 @@ def test_compare_serps_success(client):
             },
         }
 
-        response = client.get("/api/serps/compare?ids=serp1,serp2")
+        response = client.get("/serps/compare?ids=serp1,serp2")
         assert response.status_code == 200
         data = response.json()
         assert data["comparison_summary"]["serp_count"] == 2
@@ -65,7 +65,7 @@ def test_compare_serps_three_serps(client):
             "similarity_metrics": {},
         }
 
-        response = client.get("/api/serps/compare?ids=serp1,serp2,serp3")
+        response = client.get("/serps/compare?ids=serp1,serp2,serp3")
         assert response.status_code == 200
         data = response.json()
         assert data["comparison_summary"]["serp_count"] == 3
@@ -89,36 +89,36 @@ def test_compare_serps_max_five(client):
             "similarity_metrics": {},
         }
 
-        response = client.get("/api/serps/compare?ids=s1,s2,s3,s4,s5")
+        response = client.get("/serps/compare?ids=s1,s2,s3,s4,s5")
         assert response.status_code == 200
         data = response.json()
         assert data["comparison_summary"]["serp_count"] == 5
 
 
 def test_compare_serps_too_few_ids(client):
     """Test that comparison requires at least 2 IDs"""
-    response = client.get("/api/serps/compare?ids=serp1")
+    response = client.get("/serps/compare?ids=serp1")
     assert response.status_code == 400
     assert "At least 2 SERP IDs" in response.json()["detail"]
 
 
 def test_compare_serps_no_ids(client):
     """Test that IDs parameter is required"""
-    response = client.get("/api/serps/compare")
+    response = client.get("/serps/compare")
     assert response.status_code == 422  # FastAPI validation error
 
 
 def test_compare_serps_too_many_ids(client):
     """Test that comparison rejects more than 5 IDs"""
     ids = ",".join([f"serp{i}" for i in range(1, 7)])  # 6 IDs
-    response = client.get(f"/api/serps/compare?ids={ids}")
+    response = client.get(f"/serps/compare?ids={ids}")
     assert response.status_code == 400
     assert "Maximum 5 SERPs" in response.json()["detail"]
 
 
 def test_compare_serps_duplicate_ids(client):
     """Test that duplicate IDs are rejected"""
-    response = client.get("/api/serps/compare?ids=serp1,serp2,serp1")
+    response = client.get("/serps/compare?ids=serp1,serp2,serp1")
     assert response.status_code == 400
     assert "Duplicate SERP IDs" in response.json()["detail"]
 
@@ -141,7 +141,7 @@ def test_compare_serps_whitespace_handling(client):
             "similarity_metrics": {},
         }
 
-        response = client.get("/api/serps/compare?ids=serp1, serp2 , serp3")
+        response = client.get("/serps/compare?ids=serp1, serp2 , serp3")
         # Should strip whitespace and work
         assert response.status_code == 200 or response.status_code == 400
 
@@ -151,7 +151,7 @@ def test_compare_serps_not_found(client):
     with patch("archive_query_log.browser.services.aql_service.compare_serps") as mock_compare:
         mock_compare.return_value = None  # Indicates SERP not found
 
-        response = client.get("/api/serps/compare?ids=invalid1,invalid2")
+        response = client.get("/serps/compare?ids=invalid1,invalid2")
         assert response.status_code == 404
 
 
@@ -173,13 +173,13 @@ def test_compare_serps_with_url_encoding(client):
             "similarity_metrics": {},
         }
 
-        response = client.get("/api/serps/compare?ids=abc-123%2Cdef-456")
+        response = client.get("/serps/compare?ids=abc-123%2Cdef-456")
         assert response.status_code == 200
 
 
 def test_compare_serps_empty_string_ids(client):
     """Test that empty strings in ID list are filtered out"""
-    response = client.get("/api/serps/compare?ids=serp1,,serp2")
+    response = client.get("/serps/compare?ids=serp1,,serp2")
     # Should work if it filters empty strings, or fail if validation is strict
     # Depending on implementation, adjust assertion
     assert response.status_code in [200, 400]

tests/browser/search_router/test_search_router_error_handling.py

@@ -26,7 +26,7 @@ async def mock_search_connection_error(*args, **kwargs):
 
     client = TestClient(app)
 
-    response = client.get("/api/serps?query=test")
+    response = client.get("/serps?query=test")
     assert response.status_code == 503
     assert "connection failed" in response.json()["detail"].lower()
 
@@ -46,7 +46,7 @@ async def mock_search_bad_request(*args, **kwargs):
 
     client = TestClient(app)
 
-    response = client.get("/api/serps?query=test")
+    response = client.get("/serps?query=test")
     # Note: general exceptions raise 500, not 400
     # (400 is only for direct RequestError in safe_search)
     assert response.status_code in [400, 500]
@@ -71,11 +71,11 @@ async def search(self, *args, **kwargs):
     monkeypatch.setattr("archive_query_log.browser.services.aql_service.get_es_client", lambda: mock_client)
 
     # Valid interval
-    resp = client.get("/api/serps/preview?query=test&interval=day")
+    resp = client.get("/serps/preview?query=test&interval=day")
     assert resp.status_code == 200
 
     # Valid interval
-    resp = client.get("/api/serps/preview?query=test&interval=week")
+    resp = client.get("/serps/preview?query=test&interval=week")
     assert resp.status_code == 200
 
 
@@ -93,7 +93,7 @@ async def mock_suggestions(*args, **kwargs):
 
     monkeypatch.setattr("archive_query_log.browser.services.aql_service.search_suggestions", mock_suggestions)
 
-    resp = client.get("/api/suggestions?prefix=test&size=5")
+    resp = client.get("/suggestions?prefix=test&size=5")
     assert resp.status_code == 200
     data = resp.json()
     assert "suggestions" in data

tests/browser/search_router/test_search_router_preview.py

@@ -44,7 +44,7 @@ async def search(self, *args, **kwargs):
 
 
 def test_serps_preview_router(client, mock_preview_client):
-    resp = client.get("/api/serps/preview?query=test")
+    resp = client.get("/serps/preview?query=test")
     assert resp.status_code == 200
     data = resp.json()
     assert "total_hits" in data
@@ -57,7 +57,7 @@ def test_serps_preview_router(client, mock_preview_client):
 def test_serps_preview_with_params(client, mock_preview_client):
     """Test preview with custom top_n_queries and interval parameters"""
     resp = client.get(
-        "/api/serps/preview?query=test&top_n_queries=15&"
+        "/serps/preview?query=test&top_n_queries=15&"
         "interval=week&top_providers=10&top_archives=8"
     )
     assert resp.status_code == 200
@@ -70,7 +70,7 @@ def test_serps_preview_with_params(client, mock_preview_client):
 
 def test_serps_preview_with_last_n_months(client, mock_preview_client):
     """Test preview with last_n_months filter"""
-    resp = client.get("/api/serps/preview?query=test&last_n_months=12")
+    resp = client.get("/serps/preview?query=test&last_n_months=12")
     assert resp.status_code == 200
     data = resp.json()
     assert data["query"] == "test"

tests/browser/search_router/test_search_router_provider_by_id.py

@@ -8,7 +8,7 @@
 @pytest.fixture
 def app():
     app = FastAPI()
-    app.include_router(router, prefix="/api")
+    app.include_router(router, prefix="")
     return app
 
 
@@ -24,7 +24,7 @@ def test_provider_by_id_success(client):
         mock_es.get.return_value = fake_doc
         mock_get_client.return_value = mock_es
 
-        resp = client.get("/api/providers/google")
+        resp = client.get("/providers/google")
         assert resp.status_code == 200
         data = resp.json()
         assert data["provider_id"] == "google"
@@ -39,7 +39,7 @@ def test_providers_by_id_success(client):
         mock_es.get.return_value = fake_doc
         mock_get_client.return_value = mock_es
 
-        resp = client.get("/api/providers/google")
+        resp = client.get("/providers/google")
         assert resp.status_code == 200
         data = resp.json()
         assert data["provider_id"] == "google"
@@ -54,7 +54,7 @@ def test_provider_by_id_not_found(client):
         mock_es.search.return_value = {"hits": {"hits": []}}
         mock_get_client.return_value = mock_es
 
-        resp = client.get("/api/providers/unknown")
+        resp = client.get("/providers/unknown")
         assert resp.status_code == 404
         data = resp.json()
         assert data["detail"] == "No results found"