Test Rails 6 (#902)

* [MODEL] Test Rails 6

* [MODEL] Catch mongoid load errors due to gem version conflicts

* Also remoe Gemfile.lock in top-level directory

Author: estolfo

Rakefile

@@ -82,6 +82,7 @@ namespace :bundle do
     end
     sh "rm -f #{__current__.join('elasticsearch-model/gemfiles')}/*.lock"
   end
+  sh "rm -f Gemfile.lock"
 end
 
 namespace :test do

elasticsearch-model/gemfiles/6.0.gemfile

@@ -25,10 +25,10 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activemodel',  '6.0.0.rc1'
-gem 'activerecord', '6.0.0.rc1'
+gem 'activemodel',  '6.0.0'
+gem 'activerecord', '6.0.0'
 gem 'sqlite3' unless defined?(JRUBY_VERSION)
-gem 'mongoid', '~> 6'
+#gem 'mongoid', '~> 6'
 
 group :development, :testing do
   gem 'rspec'

elasticsearch-model/spec/spec_helper.rb

@@ -23,7 +23,11 @@
 require 'elasticsearch/model'
 require 'hashie/version'
 require 'active_model'
-require 'mongoid'
+begin
+  require 'mongoid'
+rescue LoadError
+  $stderr.puts("'mongoid' gem could not be loaded")
+end
 require 'yaml'
 require 'active_record'
 
@@ -151,8 +155,10 @@ def test_mongoid?
         client.database.command(ping: 1) && true
       end
     end and true
-  rescue Timeout::Error, LoadError, Mongo::Error => e
-    client.close
+  rescue LoadError
+    $stderr.puts("'mongoid' gem could not be loaded")
+  rescue Timeout::Error, Mongo::Error => e
+    client.close if client
     $stderr.puts("MongoDB not installed or running: #{e}")
   end
 end

elasticsearch-model/spec/support/app.rb

@@ -26,9 +26,7 @@
 require 'support/app/article_for_pagination'
 require 'support/app/article_with_dynamic_index_name'
 require 'support/app/episode'
-require 'support/app/image'
 require 'support/app/series'
-require 'support/app/mongoid_article'
 require 'support/app/article'
 require 'support/app/article_no_type'
 require 'support/app/searchable'
@@ -37,3 +35,12 @@
 require 'support/app/authorship'
 require 'support/app/comment'
 require 'support/app/post'
+
+
+# Mongoid models
+begin
+  require 'support/app/image'
+  require 'support/app/mongoid_article'
+rescue
+  $stderr.puts("'mongoid' gem is not installed, could not load Mongoid models")
+end