github / searchkick

Download as
Browse Code ยป

Commit c98dee03ed651599658618fe83836be9f4eec184

Authored by Andrew Kane
1 parent f4946db0
Exists in master and in 2 other branches allow_missing, conversions_v2

Use block form for Rails 5.2

Showing 3 changed files with 40 additions and 29 deletions   Show diff stats
test/reindex_test.rb
  Diff comments   View file @c98dee0
... ... @@ -24,8 +24,9 @@ class ReindexTest < Minitest::Test
24 24  
25 25 product = Product.find_by!(name: "Product A")
26 26 # TODO decide on return value
27   - assert_kind_of ActiveJob::Base, product.reindex(mode: :async)
28   - perform_enqueued_jobs
  27 + perform_enqueued_jobs do
  28 + assert_kind_of ActiveJob::Base, product.reindex(mode: :async)
  29 + end
29 30 Product.search_index.refresh
30 31 assert_search "product", ["Product A"]
31 32 end
... ... @@ -42,8 +43,9 @@ class ReindexTest < Minitest::Test
42 43 Product.search_index.refresh
43 44 assert_search "product", []
44 45  
45   - Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
46   - perform_enqueued_jobs
  46 + perform_enqueued_jobs do
  47 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  48 + end
47 49 Product.search_index.refresh
48 50 assert_search "product", ["Product A"]
49 51 end
... ... @@ -76,8 +78,9 @@ class ReindexTest < Minitest::Test
76 78 def test_relation_async
77 79 store_names ["Product A"]
78 80 store_names ["Product B", "Product C"], reindex: false
79   - Product.where(name: "Product B").reindex(mode: :async)
80   - perform_enqueued_jobs
  81 + perform_enqueued_jobs do
  82 + Product.where(name: "Product B").reindex(mode: :async)
  83 + end
81 84 Product.search_index.refresh
82 85 assert_search "product", ["Product A", "Product B"]
83 86 end
... ... @@ -87,8 +90,9 @@ class ReindexTest < Minitest::Test
87 90 Searchkick.callbacks(false) do
88 91 Product.find_by(name: "Product B").update!(name: "DO NOT INDEX")
89 92 end
90   - assert_equal true, Product.where(name: "DO NOT INDEX").reindex(mode: :async)
91   - perform_enqueued_jobs
  93 + perform_enqueued_jobs do
  94 + assert_equal true, Product.where(name: "DO NOT INDEX").reindex(mode: :async)
  95 + end
92 96 Product.search_index.refresh
93 97 assert_search "product", ["Product A"]
94 98 end
... ... @@ -104,18 +108,20 @@ class ReindexTest < Minitest::Test
104 108 Product.search_index.refresh
105 109 assert_search "product", ["Product A"]
106 110  
107   - Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
108   - perform_enqueued_jobs
  111 + perform_enqueued_jobs do
  112 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  113 + end
109 114 Product.search_index.refresh
110 115 assert_search "product", ["Product A", "Product B"]
111 116 end
112 117  
113 118 def test_full_async
114 119 store_names ["Product A"], reindex: false
115   - reindex = Product.reindex(async: true)
116   - assert_search "product", [], conversions: false
117   -
118   - perform_enqueued_jobs
  120 + reindex = nil
  121 + perform_enqueued_jobs do
  122 + reindex = Product.reindex(async: true)
  123 + assert_search "product", [], conversions: false
  124 + end
119 125  
120 126 index = Searchkick::Index.new(reindex[:index_name])
121 127 index.refresh
... ... @@ -129,9 +135,11 @@ class ReindexTest < Minitest::Test
129 135  
130 136 def test_full_async_should_index
131 137 store_names ["Product A", "Product B", "DO NOT INDEX"], reindex: false
132   - reindex = Product.reindex(async: true)
133 138  
134   - perform_enqueued_jobs
  139 + reindex = nil
  140 + perform_enqueued_jobs do
  141 + reindex = Product.reindex(async: true)
  142 + end
135 143  
136 144 index = Searchkick::Index.new(reindex[:index_name])
137 145 index.refresh
... ... @@ -152,10 +160,12 @@ class ReindexTest < Minitest::Test
152 160  
153 161 def test_full_async_non_integer_pk
154 162 Sku.create(id: SecureRandom.hex, name: "Test")
155   - reindex = Sku.reindex(async: true)
156   - assert_search "sku", [], conversions: false
157 163  
158   - perform_enqueued_jobs
  164 + reindex = nil
  165 + perform_enqueued_jobs do
  166 + reindex = Sku.reindex(async: true)
  167 + assert_search "sku", [], conversions: false
  168 + end
159 169  
160 170 index = Searchkick::Index.new(reindex[:index_name])
161 171 index.refresh
... ... @@ -227,8 +237,9 @@ class ReindexTest < Minitest::Test
227 237 assert_search "product", [], load: false, conversions: false
228 238 assert_equal 2, reindex_queue.length
229 239  
230   - Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
231   - perform_enqueued_jobs
  240 + perform_enqueued_jobs do
  241 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  242 + end
232 243 Product.searchkick_index.refresh
233 244 assert_search "product", ["Product A", "Product B"], load: false
234 245 assert_equal 0, reindex_queue.length
... ... @@ -241,8 +252,9 @@ class ReindexTest < Minitest::Test
241 252 assert_search "product", ["Product A", "Product B"], load: false
242 253 assert_equal 2, reindex_queue.length
243 254  
244   - Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
245   - perform_enqueued_jobs
  255 + perform_enqueued_jobs do
  256 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  257 + end
246 258 Product.searchkick_index.refresh
247 259 assert_search "product", ["Product A", "Product C"], load: false
248 260 assert_equal 0, reindex_queue.length
... ...
test/reindex_v2_job_test.rb
  Diff comments   View file @c98dee0
... ... @@ -5,8 +5,7 @@ class ReindexV2JobTest < Minitest::Test
5 5 product = Searchkick.callbacks(false) { Product.create!(name: "Boom") }
6 6 Product.search_index.refresh
7 7 assert_search "*", []
8   - Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s)
9   - perform_enqueued_jobs
  8 + Searchkick::ReindexV2Job.perform_now("Product", product.id.to_s)
10 9 Product.search_index.refresh
11 10 assert_search "*", ["Boom"]
12 11 end
... ... @@ -16,8 +15,7 @@ class ReindexV2JobTest < Minitest::Test
16 15 Product.reindex
17 16 assert_search "*", ["Boom"]
18 17 Searchkick.callbacks(false) { product.destroy }
19   - Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s)
20   - perform_enqueued_jobs
  18 + Searchkick::ReindexV2Job.perform_now("Product", product.id.to_s)
21 19 Product.search_index.refresh
22 20 assert_search "*", []
23 21 end
... ...
test/unscope_test.rb
  Diff comments   View file @c98dee0
... ... @@ -18,8 +18,9 @@ class UnscopeTest < ActiveSupport::TestCase
18 18 def test_relation_async
19 19 create_records
20 20  
21   - Artist.unscoped.reindex(mode: :async)
22   - perform_enqueued_jobs
  21 + perform_enqueued_jobs do
  22 + Artist.unscoped.reindex(mode: :async)
  23 + end
23 24  
24 25 Artist.search_index.refresh
25 26 assert_search "*", ["Test", "Test 2"]
... ...