Rakefile in elasticsearch-api-6.1.0 vs Rakefile in elasticsearch-api-6.2.0

@@ -12,26 +12,36 @@
 task  :test    => 'test:unit'
 
 # ----- Test tasks ------------------------------------------------------------
 
 require 'rake/testtask'
+require 'rspec/core/rake_task'
+
 namespace :test do
 
+  RSpec::Core::RakeTask.new(:spec)
+
   desc "Update the repository with YAML tests"
   task :update do
     git_specs "fetch origin --verbose", :verbose => true
   end
 
+  desc "Wait for Elasticsearch to be in a green state"
+  task :wait_for_green do
+    sh '../scripts/wait-cluster.sh'
+  end
+
   Rake::TestTask.new(:unit) do |test|
     test.libs << 'lib' << 'test'
     test.test_files = FileList["test/unit/**/*_test.rb"]
+    test.deps = [ :spec ]
     # test.verbose = true
     # test.warning = true
   end
 
   desc "Run integration tests"
-  task :integration do
+  task :integration => :wait_for_green do
     require 'elasticsearch'
 
     branches = `git --git-dir=#{__current__.join('../tmp/elasticsearch/.git')} --work-tree=#{__current__.join('../tmp/elasticsearch')} branch --no-color`
 
     current_branch = branches.
@@ -46,18 +56,20 @@
       current_branch = 'master'
     end
 
     # Define the task
     t = Rake::TestTask.new(:integration) do |test|
+      test.deps = [ :wait_for_green ]
       test.libs << 'lib' << 'test'
       test.test_files = FileList["test/integration/yaml_test_runner.rb", "test/integration/**/*_test.rb"]
       test.verbose = false
       test.warning = false
     end
 
     # Check if a test cluster is running
     begin
-      url = ENV.fetch('TEST_CLUSTER_URL', "http://localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}")
+      url = ENV['TEST_CLUSTER_URL'] || ENV['TEST_ES_SERVER']
+      url = "http://localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}" unless url
       client = Elasticsearch::Client.new :url => url
       es_version_info = client.info['version']
       build_hash      = es_version_info['build_hash']
       cluster_running = true
     rescue Faraday::Error::ConnectionFailed