tinker test setup for parallel tests

rubygems · Oct 10, 2024 · 7d2ad63 · 7d2ad63
1 parent 8349f56
commit 7d2ad63
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/test/helpers/es_helper.rb b/test/helpers/es_helper.rb
@@ -10,7 +10,6 @@ def es_version_downloads(id)
   end
 
   def get_response(id)
-    Rubygem.searchkick_index.refresh
-    Searchkick.client.get index: "rubygems-#{Rails.env}", id: id
+    Searchkick.client.get index: Rubygem.search_index.name, id: id
   end
 end
diff --git a/test/models/concerns/rubygem_searchable_test.rb b/test/models/concerns/rubygem_searchable_test.rb
@@ -191,7 +191,7 @@ class RubygemSearchableTest < ActiveSupport::TestCase
   context "source" do
     setup do
       rubygem = create(:rubygem, name: "example_gem", downloads: 10)
-      create(:version, rubygem: rubygem, summary: "some summary", description: "some description")
+      create(:version, :reindex, rubygem: rubygem, summary: "some summary", description: "some description")
     end
 
     should "return all terms of source" do

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -88,10 +88,9 @@ class ActiveSupport::TestCase
     Version.reset_column_information # TODO: Remove once https://github.com/rails/rails/pull/52703 is released
 
     SemanticLogger.reopen
-    Searchkick.index_suffix = worker
-
+    Searchkick.index_suffix = "_#{worker}"
     Rubygem.reindex
-    Rubygem.disable_callbacks
+    Searchkick.disable_callbacks
   end
 
   setup do
@@ -102,6 +101,9 @@ class ActiveSupport::TestCase
     Unpwn.offline = true
     OmniAuth.config.mock_auth.clear
 
+    Rubygem.reindex
+    Searchkick.disable_callbacks
+
     @launch_darkly = LaunchDarkly::Integrations::TestData.data_source
     config = LaunchDarkly::Config.new(data_source: @launch_darkly, send_events: false)
     Rails.configuration.launch_darkly_client = LaunchDarkly::LDClient.new("", config)