[CI] Resolves dependency issue, updates GH task

Author: picandocodigo

.github/workflows/7.x.yml

@@ -39,11 +39,11 @@ jobs:
         rake bundle:install
     - name: elasticsearch
       run: cd elasticsearch && bundle exec rake test:all
+    - name: elasticsearch-transport
+      run: cd elasticsearch-transport && bundle exec rake test:all
     - name: elasticsearch-api
       run: cd elasticsearch-api && bundle exec rake test:spec
     - name: elasticsearch-xpack
       run: cd elasticsearch-xpack && bundle exec rake test:unit test:spec
-    - name: elasticsearch-transport
-      run: cd elasticsearch-transport && bundle exec rake test:all
     - name: elasticsearch-dsl
       run: cd elasticsearch-dsl && bundle exec rake test:all

elasticsearch-api/Gemfile

@@ -20,14 +20,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-api.gemspec
 gemspec
 
-if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
-  gem 'elasticsearch', path: File.expand_path("../../elasticsearch", __FILE__), require: false
-end
-
 if File.exist? File.expand_path("../../elasticsearch-transport", __FILE__)
   gem 'elasticsearch-transport', path: File.expand_path("../../elasticsearch-transport", __FILE__), require: true
 end
 
+if File.exist? File.expand_path("../../elasticsearch/elasticsearch.gemspec", __FILE__)
+  gem 'elasticsearch', path: File.expand_path("../../elasticsearch", __FILE__), require: false
+end
+
 if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
   gem 'elasticsearch-extensions', path: File.expand_path("../../elasticsearch-extensions", __FILE__), require: false
 end

elasticsearch-api/elasticsearch-api.gemspec

@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ansi'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'elasticsearch'
-  s.add_development_dependency 'elasticsearch-extensions'
   s.add_development_dependency 'elasticsearch-transport'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'minitest-reporters'

rake_tasks/test_tasks.rake

@@ -54,7 +54,7 @@ namespace :test do
   desc 'Run rest api tests'
   task rest_api: ['elasticsearch:wait_for_green'] do
     puts '-' * 80
-    sh "cd #{CURRENT_PATH.join('elasticsearch-api')} && unset BUNDLE_GEMFILE && bundle exec rake test:rest_api[true]"
+    sh "cd #{CURRENT_PATH.join('elasticsearch-api')} && unset BUNDLE_GEMFILE && bundle exec rake test:rest_api"
     puts "\n"
   end