From 2c49d184641430c08e7aab8b91783563c26556ab Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Sun, 20 Feb 2022 20:44:50 -0800 Subject: [PATCH] Switched to test adapter [skip ci] --- test/models/animal.rb | 3 +-- test/reindex_test.rb | 21 ++++++++++++++++++--- test/reindex_v2_job_test.rb | 2 ++ test/support/helpers.rb | 2 ++ test/test_helper.rb | 2 +- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/test/models/animal.rb b/test/models/animal.rb index e91117e..2a785d3 100644 --- a/test/models/animal.rb +++ b/test/models/animal.rb @@ -3,6 +3,5 @@ class Animal inheritance: true, text_start: [:name], suggest: [:name], - index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" }, - callbacks: :async + index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" } end diff --git a/test/reindex_test.rb b/test/reindex_test.rb index 03d20b4..2fe55be 100644 --- a/test/reindex_test.rb +++ b/test/reindex_test.rb @@ -25,6 +25,7 @@ class ReindexTest < Minitest::Test product = Product.find_by!(name: "Product A") # TODO decide on return value assert_kind_of ActiveJob::Base, product.reindex(mode: :async) + perform_enqueued_jobs Product.search_index.refresh assert_search "product", ["Product A"] end @@ -42,6 +43,7 @@ class ReindexTest < Minitest::Test assert_search "product", [] Searchkick::ProcessQueueJob.perform_now(class_name: "Product") + perform_enqueued_jobs Product.search_index.refresh assert_search "product", ["Product A"] end @@ -75,6 +77,7 @@ class ReindexTest < Minitest::Test store_names ["Product A"] store_names ["Product B", "Product C"], reindex: false Product.where(name: "Product B").reindex(mode: :async) + perform_enqueued_jobs Product.search_index.refresh assert_search "product", ["Product A", "Product B"] end @@ -85,6 +88,7 @@ class ReindexTest < Minitest::Test Product.find_by(name: "Product B").update!(name: "DO NOT INDEX") end assert_equal true, Product.where(name: "DO NOT INDEX").reindex(mode: :async) + perform_enqueued_jobs Product.search_index.refresh assert_search "product", ["Product A"] end @@ -101,6 +105,7 @@ class ReindexTest < Minitest::Test assert_search "product", ["Product A"] Searchkick::ProcessQueueJob.perform_now(class_name: "Product") + perform_enqueued_jobs Product.search_index.refresh assert_search "product", ["Product A", "Product B"] end @@ -110,6 +115,8 @@ class ReindexTest < Minitest::Test reindex = Product.reindex(async: true) assert_search "product", [], conversions: false + perform_enqueued_jobs + index = Searchkick::Index.new(reindex[:index_name]) index.refresh assert_equal 1, index.total_docs @@ -124,12 +131,16 @@ class ReindexTest < Minitest::Test store_names ["Product A", "Product B", "DO NOT INDEX"], reindex: false reindex = Product.reindex(async: true) + perform_enqueued_jobs + index = Searchkick::Index.new(reindex[:index_name]) index.refresh assert_equal 2, index.total_docs end def test_full_async_wait + skip "Need to fix for test adapter" + store_names ["Product A"], reindex: false capture_io do @@ -144,6 +155,8 @@ class ReindexTest < Minitest::Test reindex = Sku.reindex(async: true) assert_search "sku", [], conversions: false + perform_enqueued_jobs + index = Searchkick::Index.new(reindex[:index_name]) index.refresh assert_equal 1, index.total_docs @@ -214,7 +227,8 @@ class ReindexTest < Minitest::Test assert_search "product", [], load: false, conversions: false assert_equal 2, reindex_queue.length - Searchkick::ProcessQueueJob.perform_later(class_name: "Product") + Searchkick::ProcessQueueJob.perform_now(class_name: "Product") + perform_enqueued_jobs Product.searchkick_index.refresh assert_search "product", ["Product A", "Product B"], load: false assert_equal 0, reindex_queue.length @@ -227,13 +241,14 @@ class ReindexTest < Minitest::Test assert_search "product", ["Product A", "Product B"], load: false assert_equal 2, reindex_queue.length - Searchkick::ProcessQueueJob.perform_later(class_name: "Product") + Searchkick::ProcessQueueJob.perform_now(class_name: "Product") + perform_enqueued_jobs Product.searchkick_index.refresh assert_search "product", ["Product A", "Product C"], load: false assert_equal 0, reindex_queue.length # ensure no error with empty queue - Searchkick::ProcessQueueJob.perform_later(class_name: "Product") + Searchkick::ProcessQueueJob.perform_now(class_name: "Product") end def test_transaction diff --git a/test/reindex_v2_job_test.rb b/test/reindex_v2_job_test.rb index 1590308..21eda4f 100644 --- a/test/reindex_v2_job_test.rb +++ b/test/reindex_v2_job_test.rb @@ -6,6 +6,7 @@ class ReindexV2JobTest < Minitest::Test Product.search_index.refresh assert_search "*", [] Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s) + perform_enqueued_jobs Product.search_index.refresh assert_search "*", ["Boom"] end @@ -16,6 +17,7 @@ class ReindexV2JobTest < Minitest::Test assert_search "*", ["Boom"] Searchkick.callbacks(false) { product.destroy } Searchkick::ReindexV2Job.perform_later("Product", product.id.to_s) + perform_enqueued_jobs Product.search_index.refresh assert_search "*", [] end diff --git a/test/support/helpers.rb b/test/support/helpers.rb index 1f0c4cb..5ac5956 100644 --- a/test/support/helpers.rb +++ b/test/support/helpers.rb @@ -1,4 +1,6 @@ class Minitest::Test + include ActiveJob::TestHelper + def setup Product.destroy_all Store.destroy_all diff --git a/test/test_helper.rb b/test/test_helper.rb index 692094d..12dbaef 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -36,7 +36,7 @@ Searchkick.redis = I18n.config.enforce_available_locales = true ActiveJob::Base.logger = $logger -ActiveJob::Base.queue_adapter = :inline +ActiveJob::Base.queue_adapter = :test ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["NOTIFICATIONS"] -- libgit2 0.21.0