From c45a425606776e937f4429402030aed8f2ab7436 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Fri, 28 Nov 2025 04:57:20 +0000
Subject: fix: respect Isolated mode in TestContext fixture helpers

Previously get_or_create_repo() and get_or_create_issue() always checked
the client cache first, bypassing the mode-based caching logic. This
caused fixture leaking across test suites when using the same AuditClient.

With this fix:
- In Isolated mode: helpers skip the cache, creating fresh fixtures
- In Shared mode: helpers use the cache for fixture reuse (unchanged)

This restores proper test isolation for push authorization tests that
were failing because they shared the same ValidRepo fixture.
---
 grasp-audit/src/fixtures.rs | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'grasp-audit/src')

diff --git a/grasp-audit/src/fixtures.rs b/grasp-audit/src/fixtures.rs
index 81620f6..6014343 100644
--- a/grasp-audit/src/fixtures.rs
+++ b/grasp-audit/src/fixtures.rs
@@ -319,18 +319,20 @@ impl<'a> TestContext<'a> {
         Ok(event)
     }
 
-    /// Get or create a ValidRepo, with caching.
+    /// Get or create a ValidRepo, with mode-aware caching.
     /// This is a helper method that avoids async recursion by not going
     /// through get_fixture. It handles the repo specifically.
     ///
     /// Uses client's fixture_cache for caching - in Shared mode this enables
     /// cross-test reuse when the same client is used.
+    /// In Isolated mode, the cache is bypassed to ensure fresh fixtures.
     async fn get_or_create_repo(&self) -> Result<Event> {
-        // Check client's cache first (shared across all TestContext instances using same client)
-        {
+        // Only check client's cache in Shared mode
+        // In Isolated mode, we always create fresh fixtures
+        if self.mode == ContextMode::Shared {
             let cache = self.client.fixture_cache().lock().unwrap();
             if let Some(event) = cache.get(&FixtureKind::ValidRepo) {
-                tracing::debug!("get_or_create_repo() found in client cache");
+                tracing::debug!("get_or_create_repo() found in client cache (Shared mode)");
                 return Ok(event.clone());
             }
         }
@@ -357,8 +359,9 @@ impl<'a> TestContext<'a> {
         self.client.send_event(repo.clone()).await
             .with_context(|| "Failed to send repo announcement to relay")?;
 
-        // Store in client's cache (shared across all TestContext instances using same client)
-        {
+        // Store in client's cache only in Shared mode
+        // In Isolated mode, we don't cache to ensure test isolation
+        if self.mode == ContextMode::Shared {
             let mut cache = self.client.fixture_cache().lock().unwrap();
             cache.insert(FixtureKind::ValidRepo, repo.clone());
             tracing::debug!("get_or_create_repo() stored in client cache ({} entries)", cache.len());
@@ -367,11 +370,11 @@ impl<'a> TestContext<'a> {
         Ok(repo)
     }
 
-    /// Get or create a RepoWithIssue, with caching via the client.
+    /// Get or create a RepoWithIssue, with mode-aware caching via the client.
     /// Returns the issue event (repo is already sent/cached via get_or_create_repo).
     async fn get_or_create_issue(&self) -> Result<Event> {
-        // Check client's cache first
-        {
+        // Only check client's cache in Shared mode
+        if self.mode == ContextMode::Shared {
             let cache = self.client.fixture_cache().lock().unwrap();
             if let Some(event) = cache.get(&FixtureKind::RepoWithIssue) {
                 return Ok(event.clone());
@@ -392,8 +395,8 @@ impl<'a> TestContext<'a> {
         // Send it
         self.client.send_event(issue.clone()).await?;
 
-        // Store in client's cache
-        {
+        // Store in client's cache only in Shared mode
+        if self.mode == ContextMode::Shared {
             let mut cache = self.client.fixture_cache().lock().unwrap();
             cache.insert(FixtureKind::RepoWithIssue, issue.clone());
         }
-- 
cgit v1.2.3