fix: reviewer's findings

Author: bradjin8

tests/_helpers.py

@@ -0,0 +1,24 @@
+"""Shared test helpers that must not live in conftest.
+
+pytest treats conftest specially and it is not guaranteed to be importable as
+``tests.conftest`` under non-default import modes (e.g. ``--import-mode=importlib``).
+"""
+from __future__ import annotations
+
+from flask.testing import FlaskClient
+
+from app import create_app
+from utils.exclusion_rules import tokenize_rule
+
+
+def client_with_rules(rule_lines: list[str]) -> FlaskClient:
+    """Flask test client with EXCLUSION_RULES parsed from the given lines.
+
+    Requires WORKSPACE_PATH / CLI_CHATS_PATH to already be set (e.g. by
+    ``workspace_storage`` fixture).
+    """
+    parsed = [tokenize_rule(line) for line in rule_lines]
+    app = create_app()
+    app.config["TESTING"] = True
+    app.config["EXCLUSION_RULES"] = [r for r in parsed if r]
+    return app.test_client()

tests/conftest.py

@@ -22,8 +22,6 @@
     HAPPY_COMPOSER_ID,
     HAPPY_WORKSPACE_ID,
 )
-from utils.exclusion_rules import tokenize_rule
-
 
 def _make_global_state_db(path: str) -> None:
     """globalStorage/state.vscdb with one composerData + one bubbleId row."""
@@ -142,19 +140,6 @@ def client(workspace_storage: str):
     return app.test_client()
 
 
-def client_with_rules(rule_lines: list[str]) -> FlaskClient:
-    """Flask test client with EXCLUSION_RULES parsed from the given lines.
-
-    Requires WORKSPACE_PATH / CLI_CHATS_PATH to already be set (e.g. by
-    ``workspace_storage`` fixture).
-    """
-    parsed = [tokenize_rule(line) for line in rule_lines]
-    app = create_app()
-    app.config["TESTING"] = True
-    app.config["EXCLUSION_RULES"] = [r for r in parsed if r]
-    return app.test_client()
-
-
 @pytest.fixture
 def empty_workspace_client() -> Generator[FlaskClient, None, None]:
     """Flask test client bound to a workspaceStorage with no workspaces.

tests/test_api_export.py

@@ -134,6 +134,8 @@ def test_since_last_with_no_prior_state_exports_all(
     def test_since_last_after_export_returns_404_when_nothing_new(
         self, client, export_state_dir
     ):
+        # Relies on the seeded composer's lastUpdatedAt (May 2024 in conftest)
+        # being older than the export state's lastExportTime set by the first call.
         first = _post_export(client, {"since": "all"})
         assert first.status_code == 200
 

tests/test_api_search.py

@@ -5,7 +5,7 @@
 from unittest.mock import patch
 
 from tests._fixture_ids import HAPPY_COMPOSER_ID, HAPPY_WORKSPACE_ID
-from tests.conftest import client_with_rules
+from tests._helpers import client_with_rules
 
 
 def _assert_search_result_shape(hit: dict) -> None:

tests/test_api_workspaces.py

@@ -5,7 +5,7 @@
 from unittest.mock import patch
 
 from tests._fixture_ids import HAPPY_COMPOSER_ID, HAPPY_WORKSPACE_ID
-from tests.conftest import client_with_rules
+from tests._helpers import client_with_rules
 
 
 def _assert_project_shape(project: dict) -> None:
@@ -104,6 +104,12 @@ def test_summary_query_returns_tab_list_without_bubbles(self, client):
         assert isinstance(tab["messageCount"], int)
         assert "bubbles" not in tab
 
+    def test_summary_query_global_workspace(self, client):
+        response = client.get("/api/workspaces/global/tabs?summary=1")
+        assert response.status_code == 200
+        body = response.get_json()
+        assert "tabs" in body and isinstance(body["tabs"], list)
+
 
 class TestGetWorkspaceTab:
     def test_happy_path_returns_single_tab(self, client):