[MODEL] Update test tasks

Author: estolfo

elasticsearch-model/Rakefile

@@ -4,12 +4,25 @@ desc "Run unit tests"
 task :default => 'test:unit'
 task :test    => 'test:unit'
 
-namespace :bundler do
-  desc "Install dependencies for all the Gemfiles"
+if RUBY_VERSION < '2.3'
+  GEMFILES = ['3.0.gemfile', '4.0.gemfile', '5.0.gemfile']
+else
+  GEMFILES = ['4.0.gemfile', '5.0.gemfile']
+end
+
+namespace :bundle do
+  desc 'Install dependencies for all the Gemfiles in /gemfiles. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
   task :install do
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/3.0.gemfile', __FILE__)}' bundle install"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/4.0.gemfile', __FILE__)}' bundle install"
-    sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/5.0.gemfile', __FILE__)}' bundle install"
+    unless defined?(JRUBY_VERSION)
+      puts '-'*80
+      gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map { |v| "#{v}.gemfile"} : GEMFILES
+      gemfiles.each do |gemfile|
+        Bundler.with_clean_env do
+          sh "bundle install --gemfile #{File.expand_path('../gemfiles/'+gemfile, __FILE__)}"
+        end
+        puts '-'*80
+      end
+    end
   end
 end
 
@@ -18,38 +31,18 @@ end
 require 'rake/testtask'
 namespace :test do
 
-  Rake::TestTask.new(:run_unit) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb"]
-    test.verbose = false
-    test.warning = false
-  end
-
-  Rake::TestTask.new(:run_integration) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/integration/**/*_test.rb"]
-    test.verbose = false
-    test.warning = false
-  end
-
-  desc "Run unit tests against ActiveModel 3, 4 and 5"
-  task :unit do
-  end
-
-  desc "Run integration tests against latest stable ActiveModel (5)"
-  task :integration do
-    ['3.0.gemfile', '4.0.gemfile', '5.0.gemfile'].each do |gemfile|
-      ['bundle exec rake test:run_unit', 'bundle exec rspec'].each do |cmd|
-        sh "BUNDLE_GEMFILE='#{File.expand_path('../gemfiles/'+gemfile, __FILE__)}' #{cmd}"
+  desc 'Run all tests. Optionally define env variable RAILS_VERSIONS. E.g. RAILS_VERSIONS=3.0,5.0'
+  task :all, [:rails_versions] do |task, args|
+    unless defined?(JRUBY_VERSION)
+      gemfiles = ENV['RAILS_VERSIONS'] ? ENV['RAILS_VERSIONS'].split(',').map { |v| "#{v}.gemfile"} : GEMFILES
+      puts '-'*80
+      gemfiles.each do |gemfile|
+        sh "BUNDLE_GEMFILE='#{File.expand_path("../gemfiles/#{gemfile}", __FILE__)}' " +
+             " bundle exec rspec"
+        puts '-'*80
       end
     end
   end
-
-  desc "Run unit and integration tests"
-  task :all do
-    Rake::Task['test:unit'].invoke
-    Rake::Task['test:integration'].invoke
-  end
 end
 
 # ----- Documentation tasks ---------------------------------------------------

elasticsearch-model/spec/spec_helper.rb

@@ -10,6 +10,10 @@
 require 'yaml'
 require 'active_record'
 
+unless defined?(ELASTICSEARCH_URL)
+  ELASTICSEARCH_URL = ENV['ELASTICSEARCH_URL'] || "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9200)}"
+end
+
 RSpec.configure do |config|
   config.formatter = 'documentation'
   config.color = true
@@ -18,7 +22,7 @@
     require 'ansi'
     tracer = ::Logger.new(STDERR)
     tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
-    Elasticsearch::Model.client = Elasticsearch::Client.new host: "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9250)}",
+    Elasticsearch::Model.client = Elasticsearch::Client.new host: ELASTICSEARCH_URL,
                                                             tracer: (ENV['QUIET'] ? nil : tracer)
 
     unless ActiveRecord::Base.connected?