[MODEL] Added ActiveRecord 5 support to integration test configuration

Author: Savater Sebastien

Rakefile

@@ -35,6 +35,8 @@ namespace :bundle do
     sh "bundle install --gemfile #{__current__.join('elasticsearch-model/gemfiles')}/3.0.gemfile"
     puts '-'*80
     sh "bundle install --gemfile #{__current__.join('elasticsearch-model/gemfiles')}/4.0.gemfile"
+    puts '-'*80
+    sh "bundle install --gemfile #{__current__.join('elasticsearch-model/gemfiles')}/5.0.gemfile"
   end
 
   desc "Remove Gemfile.lock in all subprojects"
@@ -45,6 +47,7 @@ namespace :bundle do
     end
     sh "rm -f #{__current__.join('elasticsearch-model/gemfiles')}/3.0.gemfile.lock"
     sh "rm -f #{__current__.join('elasticsearch-model/gemfiles')}/4.0.gemfile.lock"
+    sh "rm -f #{__current__.join('elasticsearch-model/gemfiles')}/5.0.gemfile.lock"
   end
 end
 

elasticsearch-model/.gitignore

@@ -18,3 +18,4 @@ tmp
 
 gemfiles/3.0.gemfile.lock
 gemfiles/4.0.gemfile.lock
+gemfiles/5.0.gemfile.lock

elasticsearch-model/Rakefile

@@ -30,10 +30,11 @@ namespace :test do
     test.warning = false
   end
 
-  desc "Run integration tests against ActiveModel 3 and 4"
+  desc "Run integration tests against ActiveModel 3, 4 and 5"
   task :integration do
     sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_integration" unless defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
     sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
+    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
   end
 
   desc "Run unit and integration tests"

elasticsearch-model/elasticsearch-model.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "kaminari"
   s.add_development_dependency "will_paginate"
 
-  s.add_development_dependency "minitest", "~> 4.2"
+  s.add_development_dependency "minitest", ">= 4.2"
   s.add_development_dependency "test-unit" if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"

elasticsearch-model/gemfiles/5.0.gemfile

@@ -0,0 +1,12 @@
+# Usage:
+#
+# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle install
+# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle exec rake test:integration
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activemodel',  '~> 5'
+gem 'activerecord', '~> 5'
+gem 'sqlite3'