github / searchkick

Download as
Browse Code ยป

Commit 144576879a263911c31e15ff45f5be402d03fd52

Authored by Sava Gerov
Committed by Andrew Kane
1 parent cb3b02c1
Exists in master and in 21 other branches allow_missing, conversions_period, conversions_v2, eager_load, find_in_batches, highlighted, index_name, lazy_index_name, less_deps, nested, reindex_async_threads, reindex_refactor, relation, relation_search, routing_queue, scope_attributes, search_as_you_type, synonyms_ci, test_language, threads, wildcard

Fix test warnings (#723)

Showing 4 changed files with 7 additions and 6 deletions   Show diff stats
lib/searchkick.rb
  Diff comments   View file @1445768
@@ -40,7 +40,7 @@ module Searchkick @@ -40,7 +40,7 @@ module Searchkick
40 @client ||= 40 @client ||=
41 Elasticsearch::Client.new( 41 Elasticsearch::Client.new(
42 url: ENV["ELASTICSEARCH_URL"], 42 url: ENV["ELASTICSEARCH_URL"],
43 - transport_options: {request: {timeout: timeout}} 43 + transport_options: {request: {timeout: timeout}, headers: { content_type: 'application/json' }}
44 ) do |f| 44 ) do |f|
45 f.use Searchkick::Middleware 45 f.use Searchkick::Middleware
46 end 46 end
lib/searchkick/index.rb
  Diff comments   View file @1445768
@@ -515,7 +515,7 @@ module Searchkick @@ -515,7 +515,7 @@ module Searchkick
515 } 515 }
516 elsif fields[field] 516 elsif fields[field]
517 fields[field].merge(fields: fields.except(field)) 517 fields[field].merge(fields: fields.except(field))
518 - end 518 + end
519 end 519 end
520 520
521 (options[:locations] || []).map(&:to_s).each do |field| 521 (options[:locations] || []).map(&:to_s).each do |field|
lib/searchkick/query.rb
  Diff comments   View file @1445768
@@ -29,6 +29,7 @@ module Searchkick @@ -29,6 +29,7 @@ module Searchkick
29 @term = term 29 @term = term
30 @options = options 30 @options = options
31 @match_suffix = options[:match] || searchkick_options[:match] || "analyzed" 31 @match_suffix = options[:match] || searchkick_options[:match] || "analyzed"
  32 + @type = @routing = @misspellings_below = @highlighted_fields = nil
32 33
33 prepare 34 prepare
34 end 35 end
@@ -400,7 +401,7 @@ module Searchkick @@ -400,7 +401,7 @@ module Searchkick
400 payload = payload.deep_merge(options[:body_options]) if options[:body_options] 401 payload = payload.deep_merge(options[:body_options]) if options[:body_options]
401 402
402 @body = payload 403 @body = payload
403 - @facet_limits = @facet_limits || {} 404 + @facet_limits ||= {}
404 @page = page 405 @page = page
405 @per_page = per_page 406 @per_page = per_page
406 @padding = padding 407 @padding = padding
@@ -752,8 +753,8 @@ module Searchkick @@ -752,8 +753,8 @@ module Searchkick
752 filters << {bool: {must_not: term_filters(field, op_value)}} 753 filters << {bool: {must_not: term_filters(field, op_value)}}
753 end 754 end
754 when :all 755 when :all
755 - op_value.each do |value|  
756 - filters << term_filters(field, value) 756 + op_value.each do |val|
  757 + filters << term_filters(field, val)
757 end 758 end
758 when :in 759 when :in
759 filters << term_filters(field, op_value) 760 filters << term_filters(field, op_value)
test/errors_test.rb
  Diff comments   View file @1445768
@@ -12,7 +12,7 @@ class ErrorsTest &lt; Minitest::Test @@ -12,7 +12,7 @@ class ErrorsTest &lt; Minitest::Test
12 } 12 }
13 } 13 }
14 index.store valid_dog 14 index.store valid_dog
15 - error = assert_raises(Searchkick::ImportError) do 15 + assert_raises(Searchkick::ImportError) do
16 index.bulk_index [valid_dog, invalid_dog] 16 index.bulk_index [valid_dog, invalid_dog]
17 end 17 end
18 end 18 end