[CI] Expand unit test matrix and only test integration on latest stable Rails, latest stable Ruby

Author: estolfo

.travis.yml

@@ -21,19 +21,27 @@ branches:
 
 matrix:
   include:
-    - rvm: 2.2.10
+    - rvm: 2.2
       jdk: oraclejdk8
       env: TEST_SUITE=unit
 
-    - rvm: 2.3.7
+    - rvm: 2.3
       jdk: oraclejdk8
       env: TEST_SUITE=unit
 
-    - rvm: 2.5.1
+    - rvm: 2.4
       jdk: oraclejdk8
       env: TEST_SUITE=unit
 
-    - rvm: 2.5.1
+    - rvm: 2.5
+      jdk: oraclejdk8
+      env: TEST_SUITE=unit
+
+    - rvm: jruby-9.1
+      jdk: oraclejdk8
+      env: TEST_SUITE=unit
+
+    - rvm: 2.5
       jdk: oraclejdk8
       env: TEST_SUITE=integration QUIET=y
 

elasticsearch-model/Rakefile

@@ -38,10 +38,10 @@ namespace :test do
     sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle exec rake test:run_unit"
   end
 
-  desc "Run integration tests against ActiveModel 3, 4 and 5"
+  desc "Run integration tests against latest stable ActiveModel (5)"
   task :integration do
     #sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle exec rake test:run_integration"
+    #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