github / searchkick

Download as
Browse Code ยป

Commit 783671d7ca559144ec7cfe8e44af9c78149d947f

Authored by Andrew
1 parent 314c0964
Exists in master and in 18 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, index_name, lazy_index_name, less_deps, nested, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, wildcard

Removed unused methods

Showing 4 changed files with 1 additions and 20 deletions   Show diff stats
lib/searchkick/query.rb
  Diff comments   View file @783671d
... ... @@ -960,10 +960,6 @@ module Searchkick
960 960 end
961 961 end
962 962  
963   - def below60?
964   - Searchkick.server_below?("6.0.0-alpha1")
965   - end
966   -
967 963 def below61?
968 964 Searchkick.server_below?("6.1.0-alpha1")
969 965 end
... ...
test/geo_shape_test.rb
  Diff comments   View file @783671d
... ... @@ -116,9 +116,6 @@ class GeoShapeTest < Minitest::Test
116 116 end
117 117  
118 118 def test_search_math
119   - # TODO find out why this is failing
120   - skip unless elasticsearch_below60?
121   -
122 119 assert_search "witch", ["Region A"], {
123 120 where: {
124 121 territory: {
... ...
test/index_test.rb
  Diff comments   View file @783671d
... ... @@ -150,11 +150,7 @@ class IndexTest < Minitest::Test
150 150 store [{name: "Product A", text: large_value}], Region
151 151 assert_search "product", ["Product A"], {}, Region
152 152 assert_search "hello", ["Product A"], {fields: [:name, :text]}, Region
153   -
154   - # needs fields for ES 6
155   - if elasticsearch_below60?
156   - assert_search "hello", ["Product A"], {}, Region
157   - end
  153 + assert_search "hello", ["Product A"], {}, Region
158 154 end
159 155  
160 156 def test_very_large_value
... ...
test/test_helper.rb
  Diff comments   View file @783671d
... ... @@ -38,14 +38,6 @@ end
38 38  
39 39 ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["NOTIFICATIONS"]
40 40  
41   -def elasticsearch_below60?
42   - Searchkick.server_below?("6.0.0-alpha1")
43   -end
44   -
45   -def elasticsearch_below61?
46   - Searchkick.server_below?("6.1.0-alpha1")
47   -end
48   -
49 41 def nobrainer?
50 42 defined?(NoBrainer)
51 43 end
... ...