From c174d142c9a0dca2bb0104cae697c9a26f51a1f5 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Wed, 9 Mar 2022 11:30:12 -0500 Subject: [PATCH] Use search_index in tests --- test/inheritance_test.rb | 4 ++-- test/multi_indices_test.rb | 8 ++++---- test/partial_reindex_test.rb | 4 ++-- test/reindex_test.rb | 18 +++++++++--------- test/routing_test.rb | 2 +- test/search_test.rb | 2 +- test/should_index_test.rb | 6 +++--- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/inheritance_test.rb b/test/inheritance_test.rb index 9594b65..d90a24c 100644 --- a/test/inheritance_test.rb +++ b/test/inheritance_test.rb @@ -13,7 +13,7 @@ class InheritanceTest < Minitest::Test end def test_child_index_name - assert_equal "animals_test#{ENV["TEST_ENV_NUMBER"]}", Dog.searchkick_index.name + assert_equal "animals_test#{ENV["TEST_ENV_NUMBER"]}", Dog.search_index.name end def test_child_search @@ -116,7 +116,7 @@ class InheritanceTest < Minitest::Test def test_index_name_string store_names ["Product A"] error = assert_raises Searchkick::Error do - Searchkick.search("product", index_name: [Product.searchkick_index.name]).map(&:name) + Searchkick.search("product", index_name: [Product.search_index.name]).map(&:name) end assert_includes error.message, "Unknown model" end diff --git a/test/multi_indices_test.rb b/test/multi_indices_test.rb index 3d4244d..cbae734 100644 --- a/test/multi_indices_test.rb +++ b/test/multi_indices_test.rb @@ -14,19 +14,19 @@ class MultiIndicesTest < Minitest::Test def test_index_name store_names ["Product A"] - assert_equal ["Product A"], Product.search("product", index_name: Product.searchkick_index.name).map(&:name) + assert_equal ["Product A"], Product.search("product", index_name: Product.search_index.name).map(&:name) assert_equal ["Product A"], Product.search("product", index_name: Product).map(&:name) Speaker.search_index.refresh - assert_equal [], Product.search("product", index_name: Speaker.searchkick_index.name, conversions: false).map(&:name) + assert_equal [], Product.search("product", index_name: Speaker.search_index.name, conversions: false).map(&:name) end def test_models_and_index_name store_names ["Product A"] store_names ["Product B"], Speaker - assert_equal ["Product A"], Searchkick.search("product", models: [Product, Store], index_name: Product.searchkick_index.name).map(&:name) + assert_equal ["Product A"], Searchkick.search("product", models: [Product, Store], index_name: Product.search_index.name).map(&:name) error = assert_raises(Searchkick::Error) do - Searchkick.search("product", models: [Product, Store], index_name: Speaker.searchkick_index.name).map(&:name) + Searchkick.search("product", models: [Product, Store], index_name: Speaker.search_index.name).map(&:name) end assert_includes error.message, "Unknown model" # legacy diff --git a/test/partial_reindex_test.rb b/test/partial_reindex_test.rb index 90d0ba4..db24d1b 100644 --- a/test/partial_reindex_test.rb +++ b/test/partial_reindex_test.rb @@ -15,7 +15,7 @@ class PartialReindexTest < Minitest::Test Searchkick.callbacks(false) do product.save! end - Product.searchkick_index.refresh + Product.search_index.refresh # index not updated assert_search "hi", ["Hi"], fields: [:name], load: false @@ -43,7 +43,7 @@ class PartialReindexTest < Minitest::Test Searchkick.callbacks(false) do product.save! end - Product.searchkick_index.refresh + Product.search_index.refresh # index not updated assert_search "hi", ["Hi"], fields: [:name], load: false diff --git a/test/reindex_test.rb b/test/reindex_test.rb index f8dedc4..c3869e1 100644 --- a/test/reindex_test.rb +++ b/test/reindex_test.rb @@ -30,7 +30,7 @@ class ReindexTest < Minitest::Test end def test_record_queue - reindex_queue = Product.searchkick_index.reindex_queue + reindex_queue = Product.search_index.reindex_queue reindex_queue.clear store_names ["Product A", "Product B"], reindex: false @@ -133,7 +133,7 @@ class ReindexTest < Minitest::Test end def test_relation_queue - reindex_queue = Product.searchkick_index.reindex_queue + reindex_queue = Product.search_index.reindex_queue reindex_queue.clear store_names ["Product A"] @@ -171,7 +171,7 @@ class ReindexTest < Minitest::Test assert Searchkick.reindex_status(reindex[:name]) - Product.searchkick_index.promote(reindex[:index_name]) + Product.search_index.promote(reindex[:index_name]) assert_search "product", ["Product A"] end @@ -274,20 +274,20 @@ class ReindexTest < Minitest::Test # TODO figure out which earlier test leaves records in index Product.reindex - reindex_queue = Product.searchkick_index.reindex_queue + reindex_queue = Product.search_index.reindex_queue reindex_queue.clear Searchkick.callbacks(:queue) do store_names ["Product A", "Product B"] end - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "product", [], load: false, conversions: false assert_equal 2, reindex_queue.length perform_enqueued_jobs do Searchkick::ProcessQueueJob.perform_now(class_name: "Product") end - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "product", ["Product A", "Product B"], load: false assert_equal 0, reindex_queue.length @@ -295,14 +295,14 @@ class ReindexTest < Minitest::Test Product.where(name: "Product B").destroy_all Product.create!(name: "Product C") end - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "product", ["Product A", "Product B"], load: false assert_equal 2, reindex_queue.length perform_enqueued_jobs do Searchkick::ProcessQueueJob.perform_now(class_name: "Product") end - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "product", ["Product A", "Product C"], load: false assert_equal 0, reindex_queue.length @@ -328,7 +328,7 @@ class ReindexTest < Minitest::Test end def test_both_paths - Product.searchkick_index.delete if Product.searchkick_index.exists? + Product.search_index.delete if Product.search_index.exists? Product.reindex Product.reindex # run twice for both index paths end diff --git a/test/routing_test.rb b/test/routing_test.rb index 49255b9..a739db7 100644 --- a/test/routing_test.rb +++ b/test/routing_test.rb @@ -7,7 +7,7 @@ class RoutingTest < Minitest::Test end def test_mappings - mappings = Store.searchkick_index.index_options[:mappings] + mappings = Store.search_index.index_options[:mappings] assert_equal mappings[:_routing], required: true end diff --git a/test/search_test.rb b/test/search_test.rb index ccd9149..de39afe 100644 --- a/test/search_test.rb +++ b/test/search_test.rb @@ -44,7 +44,7 @@ class SearchTest < Minitest::Test end def test_bad_mapping - Product.searchkick_index.delete + Product.search_index.delete store_names ["Product A"] error = assert_raises(Searchkick::InvalidQueryError) { Product.search("test").to_a } assert_equal "Bad mapping - run Product.reindex", error.message diff --git a/test/should_index_test.rb b/test/should_index_test.rb index c3531c2..2211f7e 100644 --- a/test/should_index_test.rb +++ b/test/should_index_test.rb @@ -16,7 +16,7 @@ class ShouldIndexTest < Minitest::Test product = Product.first product.name = "INDEX" product.save! - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "index", ["INDEX"] end @@ -26,7 +26,7 @@ class ShouldIndexTest < Minitest::Test product = Product.first product.name = "DO NOT INDEX" product.save! - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "index", [] end @@ -38,7 +38,7 @@ class ShouldIndexTest < Minitest::Test product.save! end Product.where(id: product.id).reindex - Product.searchkick_index.refresh + Product.search_index.refresh assert_search "index", [] end end -- libgit2 0.21.0