github / searchkick

Download as
Browse Code ยป

Commit 2c49d184641430c08e7aab8b91783563c26556ab

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

Switched to test adapter [skip ci]

Showing 5 changed files with 24 additions and 6 deletions   Show diff stats
test/models/animal.rb
  Diff comments   View file @2c49d18
... ... @@ -3,6 +3,5 @@ class Animal
3 3 inheritance: true,
4 4 text_start: [:name],
5 5 suggest: [:name],
6   - index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },
7   - callbacks: :async
  6 + index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" }
8 7 end
... ...
test/reindex_test.rb
  Diff comments   View file @2c49d18
... ... @@ -25,6 +25,7 @@ class ReindexTest < Minitest::Test
25 25 product = Product.find_by!(name: "Product A")
26 26 # TODO decide on return value
27 27 assert_kind_of ActiveJob::Base, product.reindex(mode: :async)
  28 + perform_enqueued_jobs
28 29 Product.search_index.refresh
29 30 assert_search "product", ["Product A"]
30 31 end
... ... @@ -42,6 +43,7 @@ class ReindexTest < Minitest::Test
42 43 assert_search "product", []
43 44  
44 45 Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  46 + perform_enqueued_jobs
45 47 Product.search_index.refresh
46 48 assert_search "product", ["Product A"]
47 49 end
... ... @@ -75,6 +77,7 @@ class ReindexTest < Minitest::Test
75 77 store_names ["Product A"]
76 78 store_names ["Product B", "Product C"], reindex: false
77 79 Product.where(name: "Product B").reindex(mode: :async)
  80 + perform_enqueued_jobs
78 81 Product.search_index.refresh
79 82 assert_search "product", ["Product A", "Product B"]
80 83 end
... ... @@ -85,6 +88,7 @@ class ReindexTest < Minitest::Test
85 88 Product.find_by(name: "Product B").update!(name: "DO NOT INDEX")
86 89 end
87 90 assert_equal true, Product.where(name: "DO NOT INDEX").reindex(mode: :async)
  91 + perform_enqueued_jobs
88 92 Product.search_index.refresh
89 93 assert_search "product", ["Product A"]
90 94 end
... ... @@ -101,6 +105,7 @@ class ReindexTest < Minitest::Test
101 105 assert_search "product", ["Product A"]
102 106  
103 107 Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  108 + perform_enqueued_jobs
104 109 Product.search_index.refresh
105 110 assert_search "product", ["Product A", "Product B"]
106 111 end
... ... @@ -110,6 +115,8 @@ class ReindexTest < Minitest::Test
110 115 reindex = Product.reindex(async: true)
111 116 assert_search "product", [], conversions: false
112 117  
  118 + perform_enqueued_jobs
  119 +
113 120 index = Searchkick::Index.new(reindex[:index_name])
114 121 index.refresh
115 122 assert_equal 1, index.total_docs
... ... @@ -124,12 +131,16 @@ class ReindexTest < Minitest::Test
124 131 store_names ["Product A", "Product B", "DO NOT INDEX"], reindex: false
125 132 reindex = Product.reindex(async: true)
126 133  
  134 + perform_enqueued_jobs
  135 +
127 136 index = Searchkick::Index.new(reindex[:index_name])
128 137 index.refresh
129 138 assert_equal 2, index.total_docs
130 139 end
131 140  
132 141 def test_full_async_wait
  142 + skip "Need to fix for test adapter"
  143 +
133 144 store_names ["Product A"], reindex: false
134 145  
135 146 capture_io do
... ... @@ -144,6 +155,8 @@ class ReindexTest < Minitest::Test
144 155 reindex = Sku.reindex(async: true)
145 156 assert_search "sku", [], conversions: false
146 157  
  158 + perform_enqueued_jobs
  159 +
147 160 index = Searchkick::Index.new(reindex[:index_name])
148 161 index.refresh
149 162 assert_equal 1, index.total_docs
... ... @@ -214,7 +227,8 @@ class ReindexTest < Minitest::Test
214 227 assert_search "product", [], load: false, conversions: false
215 228 assert_equal 2, reindex_queue.length
216 229  
217   - Searchkick::ProcessQueueJob.perform_later(class_name: "Product")
  230 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  231 + perform_enqueued_jobs
218 232 Product.searchkick_index.refresh
219 233 assert_search "product", ["Product A", "Product B"], load: false
220 234 assert_equal 0, reindex_queue.length
... ... @@ -227,13 +241,14 @@ class ReindexTest < Minitest::Test
227 241 assert_search "product", ["Product A", "Product B"], load: false
228 242 assert_equal 2, reindex_queue.length
229 243  
230   - Searchkick::ProcessQueueJob.perform_later(class_name: "Product")
  244 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
  245 + perform_enqueued_jobs
231 246 Product.searchkick_index.refresh
232 247 assert_search "product", ["Product A", "Product C"], load: false
233 248 assert_equal 0, reindex_queue.length
234 249  
235 250 # ensure no error with empty queue
236   - Searchkick::ProcessQueueJob.perform_later(class_name: "Product")
  251 + Searchkick::ProcessQueueJob.perform_now(class_name: "Product")
237 252 end
238 253  
239 254 def test_transaction
... ...
test/reindex_v2_job_test.rb
  Diff comments   View file @2c49d18
... ... @@ -6,6 +6,7 @@ class ReindexV2JobTest < Minitest::Test
6 6 Product.search_index.refresh
7 7 assert_search "*", []
8 8 Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s)
  9 + perform_enqueued_jobs
9 10 Product.search_index.refresh
10 11 assert_search "*", ["Boom"]
11 12 end
... ... @@ -16,6 +17,7 @@ class ReindexV2JobTest < Minitest::Test
16 17 assert_search "*", ["Boom"]
17 18 Searchkick.callbacks(false) { product.destroy }
18 19 Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s)
  20 + perform_enqueued_jobs
19 21 Product.search_index.refresh
20 22 assert_search "*", []
21 23 end
... ...
test/support/helpers.rb
  Diff comments   View file @2c49d18
1 1 class Minitest::Test
  2 + include ActiveJob::TestHelper
  3 +
2 4 def setup
3 5 Product.destroy_all
4 6 Store.destroy_all
... ...
test/test_helper.rb
  Diff comments   View file @2c49d18
... ... @@ -36,7 +36,7 @@ Searchkick.redis =
36 36 I18n.config.enforce_available_locales = true
37 37  
38 38 ActiveJob::Base.logger = $logger
39   -ActiveJob::Base.queue_adapter = :inline
  39 +ActiveJob::Base.queue_adapter = :test
40 40  
41 41 ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
42 42  
... ...