Improved tests start time

Andrew Kane
1 parent ac5c952d
Showing 7 changed files with 31 additions and 28 deletions Show diff stats
test/boost_test.rb
test/inheritance_test.rb
test/match_test.rb
test/query_test.rb
test/reindex_test.rb
test/should_index_test.rb
test/support/helpers.rb
@@ -171,6 +171,7 @@ class BoostTest &lt; Minitest::Test
   end
   def test_boost_by_indices
+    setup_animal
     store_names ["Rex"], Animal
     store_names ["Rexx"], Product
 require_relative "test_helper"
 class InheritanceTest < Minitest::Test
+  def setup
+    super
+    setup_animal
+  end
+
   def test_child_reindex
     store_names ["Max"], Cat
     assert Dog.reindex
 require_relative "test_helper"
 class MatchTest < Minitest::Test
-  def setup
-    super
-    setup_speaker
-  end
-
   # exact
   def test_match
@@ -230,6 +225,7 @@ class MatchTest &lt; Minitest::Test
   end
   def test_dynamic_fields
+    setup_speaker
     store_names ["Red Bull"], Speaker
     assert_search "redbull", ["Red Bull"], {fields: [:name]}, Speaker
   end
 require_relative "test_helper"
 class QueryTest < Minitest::Test
-  def setup
-    super
-    setup_speaker
-  end
-
   def test_basic
     store_names ["Milk", "Apple"]
     query = Product.search("milk", body: {query: {match_all: {}}})
@@ -54,6 +49,7 @@ class QueryTest &lt; Minitest::Test
   # nested
   def test_nested_search
+    setup_speaker
     store [{name: "Product A", aisle: {"id" => 1, "name" => "Frozen"}}], Speaker
     assert_search "frozen", ["Product A"], {fields: ["aisle.name"]}, Speaker
   end
@@ -321,4 +321,10 @@ class ReindexTest &lt; Minitest::Test
     end
     assert_search "*", []
   end
+
+  def test_both_paths
+    Product.searchkick_index.delete if Product.searchkick_index.exists?
+    Product.reindex
+    Product.reindex # run twice for both index paths
+  end
 end
@@ -7,7 +7,7 @@ class ShouldIndexTest &lt; Minitest::Test
   end
   def test_default_true
-    assert Animal.new.should_index?
+    assert Store.new.should_index?
   end
   def test_change_to_true
@@ -2,32 +2,31 @@ class Minitest::Test
   include ActiveJob::TestHelper
   def setup
-    $setup_once ||= begin
-      # TODO improve
-      Product.searchkick_index.delete if Product.searchkick_index.exists?
-      Product.reindex
-      Product.reindex # run twice for both index paths
-      Product.create!(name: "Set mapping")
-
-      Store.reindex
-      Animal.reindex
+    [Product, Store].each do |model|
+      setup_model(model)
     end
-
-    Product.destroy_all
-    Store.destroy_all
-    Animal.destroy_all
   end
   protected
+  def setup_animal
+    setup_model(Animal)
+  end
+
   def setup_region
-    $setup_region ||= (Region.reindex || true)
-    Region.destroy_all
+    setup_model(Region)
   end
   def setup_speaker
-    $setup_speaker ||= (Speaker.reindex || true)
-    Speaker.destroy_all
+    setup_model(Speaker)
+  end
+
+  def setup_model(model)
+    # reindex once
+    ($setup_model ||= {})[model] ||= (model.reindex || true)
+
+    # clear every time
+    model.destroy_all
   end
   def store(documents, model = default_model, reindex: true)
	@@ -171,6 +171,7 @@ class BoostTest < Minitest::Test		@@ -171,6 +171,7 @@ class BoostTest < Minitest::Test
171	end	171	end
172		172
173	def test_boost_by_indices	173	def test_boost_by_indices
		174	+ setup_animal
174	store_names ["Rex"], Animal	175	store_names ["Rex"], Animal
175	store_names ["Rexx"], Product	176	store_names ["Rexx"], Product
176		177
	@@ -321,4 +321,10 @@ class ReindexTest < Minitest::Test		@@ -321,4 +321,10 @@ class ReindexTest < Minitest::Test
321	end	321	end
322	assert_search "*", []	322	assert_search "*", []
323	end	323	end
		324	+
		325	+ def test_both_paths
		326	+ Product.searchkick_index.delete if Product.searchkick_index.exists?
		327	+ Product.reindex
		328	+ Product.reindex # run twice for both index paths
		329	+ end
324	end	330	end
	@@ -7,7 +7,7 @@ class ShouldIndexTest < Minitest::Test		@@ -7,7 +7,7 @@ class ShouldIndexTest < Minitest::Test
7	end	7	end
8		8
9	def test_default_true	9	def test_default_true
10	- assert Animal.new.should_index?	10	+ assert Store.new.should_index?
11	end	11	end
12		12
13	def test_change_to_true	13	def test_change_to_true