github / searchkick

Download as
Browse Code »

Commit 2bb3dc5c2686ad3240bafdf35d81eaaf871d71ea

Authored by Andrew Kane
2 parents 12caa1e6 5fc13549
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

Merge branch 'master' into raise_dangerous_operations

Showing 4 changed files with 11 additions and 1 deletions   Show diff stats
.travis.yml
  Diff comments   View file @2bb3dc5
... ... @@ -21,6 +21,7 @@ gemfile:
21 21 - test/gemfiles/mongoid2.gemfile
22 22 - test/gemfiles/mongoid3.gemfile
23 23 - test/gemfiles/mongoid4.gemfile
  24 + - test/gemfiles/mongoid5.gemfile
24 25 matrix:
25 26 include:
26 27 - gemfile: test/gemfiles/nobrainer.gemfile
... ...
test/gemfiles/mongoid5.gemfile 0 → 100644
  Diff comments   View file @2bb3dc5
... ... @@ -0,0 +1,7 @@
  1 +source 'https://rubygems.org'
  2 +
  3 +# Specify your gem's dependencies in searchkick.gemspec
  4 +gemspec path: "../../"
  5 +
  6 +gem "mongoid", "~> 5.0.0"
  7 +gem "activejob_backport"
... ...
test/index_test.rb
  Diff comments   View file @2bb3dc5
... ... @@ -114,7 +114,7 @@ class IndexTest < Minitest::Test
114 114 raise ActiveRecord::Rollback
115 115 end
116 116  
117   - assert_search "product", []
  117 + assert_search "product", [], conversions: false
118 118 end
119 119  
120 120 end
... ...
test/test_helper.rb
  Diff comments   View file @2bb3dc5
... ... @@ -23,6 +23,8 @@ def elasticsearch2?
23 23 end
24 24  
25 25 if defined?(Mongoid)
  26 + Mongoid.logger.level = Logger::INFO
  27 + Mongo::Logger.logger.level = Logger::INFO if defined?(Mongo::Logger)
26 28  
27 29 def mongoid2?
28 30 Mongoid::VERSION.starts_with?("2.")
... ...