Fixed async wait for inline adapter

Andrew
1 parent f691a1ba
Showing 2 changed files with 17 additions and 3 deletions Show diff stats
lib/searchkick/bulk_indexer.rb
test/reindex_test.rb
@@ -138,12 +138,12 @@ module Searchkick
     end
  
     def bulk_reindex_job(scope, batch_id, options)
+      Searchkick.with_redis { |r| r.sadd(batches_key, batch_id) }
       Searchkick::BulkReindexJob.perform_later({
         class_name: scope.model_name.name,
         index_name: index.name,
         batch_id: batch_id
       }.merge(options))
-      Searchkick.with_redis { |r| r.sadd(batches_key, batch_id) }
     end
  
     def with_retries
@@ -28,7 +28,7 @@ class ReindexTest &lt; Minitest::Test
   end
  
   def test_async
-    skip if !defined?(ActiveJob)
+    skip unless defined?(ActiveJob)
  
     Searchkick.callbacks(false) do
       store_names ["Product A"]
@@ -48,8 +48,22 @@ class ReindexTest &lt; Minitest::Test
     assert_search "product", ["Product A"]
   end
  
+  def test_async_wait
+    skip unless defined?(ActiveJob)
+
+    Searchkick.callbacks(false) do
+      store_names ["Product A"]
+    end
+
+    capture_io do
+      Product.reindex(async: {wait: true})
+    end
+
+    assert_search "product", ["Product A"]
+  end
+
   def test_async_non_integer_pk
-    skip if !defined?(ActiveJob)
+    skip unless defined?(ActiveJob)
  
     Sku.create(id: SecureRandom.hex, name: "Test")
     reindex = Sku.reindex(async: true)
...	...	@@ -138,12 +138,12 @@ module Searchkick
138	138	end
139	139
140	140	def bulk_reindex_job(scope, batch_id, options)
	141	+ Searchkick.with_redis { \|r\| r.sadd(batches_key, batch_id) }
141	142	Searchkick::BulkReindexJob.perform_later({
142	143	class_name: scope.model_name.name,
143	144	index_name: index.name,
144	145	batch_id: batch_id
145	146	}.merge(options))
146		- Searchkick.with_redis { \|r\| r.sadd(batches_key, batch_id) }
147	147	end
148	148
149	149	def with_retries
...	...
...	...	@@ -28,7 +28,7 @@ class ReindexTest < Minitest::Test
28	28	end
29	29
30	30	def test_async
31		- skip if !defined?(ActiveJob)
	31	+ skip unless defined?(ActiveJob)
32	32
33	33	Searchkick.callbacks(false) do
34	34	store_names ["Product A"]
...	...	@@ -48,8 +48,22 @@ class ReindexTest < Minitest::Test
48	48	assert_search "product", ["Product A"]
49	49	end
50	50
	51	+ def test_async_wait
	52	+ skip unless defined?(ActiveJob)
	53	+
	54	+ Searchkick.callbacks(false) do
	55	+ store_names ["Product A"]
	56	+ end
	57	+
	58	+ capture_io do
	59	+ Product.reindex(async: {wait: true})
	60	+ end
	61	+
	62	+ assert_search "product", ["Product A"]
	63	+ end
	64	+
51	65	def test_async_non_integer_pk
52		- skip if !defined?(ActiveJob)
	66	+ skip unless defined?(ActiveJob)
53	67
54	68	Sku.create(id: SecureRandom.hex, name: "Test")
55	69	reindex = Sku.reindex(async: true)
...	...