Use class-level prefetch flag and verify all batches succeed

Author: kenyonj

test/collections_test_helper.rb

@@ -110,7 +110,7 @@ def possible_image_file_names_for_collection(collection)
 GRAPHQL_BATCH_SIZE = 100
 
 def prefetch_all_collection_items!
-  return if @_prefetched
+  return if NewOctokit.global_prefetch_done?
 
   all_repos = []
   all_users = []
@@ -128,21 +128,26 @@ def prefetch_all_collection_items!
   all_repos.uniq!
   all_users.uniq!
 
-  # Batch repos in chunks to stay within GraphQL query limits
-  all_repos.each_slice(GRAPHQL_BATCH_SIZE) do |batch|
-    cache_repos_exist_check!(batch)
-  end
+  begin
+    # Batch repos in chunks to stay within GraphQL query limits
+    all_repos.each_slice(GRAPHQL_BATCH_SIZE) do |batch|
+      cache_repos_exist_check!(batch)
+    end
 
-  # Batch users in chunks
-  all_users.each_slice(GRAPHQL_BATCH_SIZE) do |batch|
-    cache_users_exist_check!(batch)
-  end
+    # Batch users in chunks
+    all_users.each_slice(GRAPHQL_BATCH_SIZE) do |batch|
+      cache_users_exist_check!(batch)
+    end
 
-  # Check orgs for users not found
-  not_found_users = users_not_found_from(all_users)
-  not_found_users.each_slice(GRAPHQL_BATCH_SIZE) do |batch|
-    cache_orgs_exist_check!(batch)
-  end
+    # Check orgs for users not found
+    not_found_users = users_not_found_from(all_users)
+    not_found_users.each_slice(GRAPHQL_BATCH_SIZE) do |batch|
+      cache_orgs_exist_check!(batch)
+    end
 
-  @_prefetched = true
+    # Only mark as done after ALL batch calls completed successfully
+    NewOctokit.global_prefetch_done!
+  rescue StandardError => error
+    warn "Global prefetch failed, falling back to per-test caching: #{error.message}"
+  end
 end

test/test_helper.rb

@@ -59,6 +59,7 @@ class NewOctokit < Octokit::Client
   @@repo_request_count = 0 unless defined? @@repo_request_count
   @@user_request_count = 0 unless defined? @@user_request_count
   @@messages = [] unless defined? @@messages
+  @@global_prefetch_done = false unless defined? @@global_prefetch_done
 
   def repos
     @@repos
@@ -122,6 +123,14 @@ def self.messages
     @@messages
   end
 
+  def self.global_prefetch_done?
+    @@global_prefetch_done
+  end
+
+  def self.global_prefetch_done!
+    @@global_prefetch_done = true
+  end
+
   # rubocop:enable Style/ClassVars
 end