diff --git a/.travis.yml b/.travis.yml index eae46d1..2b73a12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ gemfile: - test/gemfiles/mongoid5.gemfile - test/gemfiles/mongoid6.gemfile env: - - ELASTICSEARCH_VERSION=6.2.1 + - ELASTICSEARCH_VERSION=6.2.2 jdk: oraclejdk8 matrix: include: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d187b0..9bef7e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## 3.0.0 [unreleased] - Removed support for Elasticsearch 2 -- Removed support for ActiveRecord < 4.2 +- Removed support for ActiveRecord < 4.2 and Mongoid < 5 - Removed `reindex_async` method. `reindex` now defaults to mode specified by model. Use `reindex(mode: :async)` to force async reindex. ## 2.5.1 [unreleased] diff --git a/test/gemfiles/activerecord31.gemfile b/test/gemfiles/activerecord31.gemfile deleted file mode 100644 index 88461cb..0000000 --- a/test/gemfiles/activerecord31.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "sqlite3" -gem "activerecord", "~> 3.1.0" diff --git a/test/gemfiles/activerecord32.gemfile b/test/gemfiles/activerecord32.gemfile deleted file mode 100644 index 13ebc63..0000000 --- a/test/gemfiles/activerecord32.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "sqlite3" -gem "activerecord", "~> 3.2.0" diff --git a/test/gemfiles/activerecord40.gemfile b/test/gemfiles/activerecord40.gemfile deleted file mode 100644 index ec42573..0000000 --- a/test/gemfiles/activerecord40.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "sqlite3" -gem "activerecord", "~> 4.0.0" -gem "activejob_backport" diff --git a/test/gemfiles/activerecord41.gemfile b/test/gemfiles/activerecord41.gemfile deleted file mode 100644 index faa7716..0000000 --- a/test/gemfiles/activerecord41.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "sqlite3" -gem "activerecord", "~> 4.1.0" -gem "activejob_backport" diff --git a/test/gemfiles/mongoid2.gemfile b/test/gemfiles/mongoid2.gemfile deleted file mode 100644 index e9abcd0..0000000 --- a/test/gemfiles/mongoid2.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "mongoid", "~> 2" -gem "bson_ext" diff --git a/test/gemfiles/mongoid3.gemfile b/test/gemfiles/mongoid3.gemfile deleted file mode 100644 index fc1d993..0000000 --- a/test/gemfiles/mongoid3.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "mongoid", "~> 3.1.0" diff --git a/test/gemfiles/mongoid4.gemfile b/test/gemfiles/mongoid4.gemfile deleted file mode 100644 index 6fe5dd1..0000000 --- a/test/gemfiles/mongoid4.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../../" - -gem "mongoid", "~> 4.0.0" -gem "activejob_backport" diff --git a/test/records_test.rb b/test/records_test.rb deleted file mode 100644 index d779a97..0000000 --- a/test/records_test.rb +++ /dev/null @@ -1,10 +0,0 @@ -require_relative "test_helper" - -class RecordsTest < Minitest::Test - def test_records - skip if cequel? - - store_names ["Milk", "Apple"] - assert_equal Product.search("milk").records.where(name: "Milk").count, 1 - end -end -- libgit2 0.21.0