Removes dev dependency on extensions in elasticsearch-dsl

elastic · Mar 4, 2021 · cb60c34 · cb60c34
1 parent c4f562f
commit cb60c34
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 72 deletions.
diff --git a/Gemfile b/Gemfile
@@ -32,10 +32,6 @@ if File.exist? File.expand_path('../../elasticsearch-api', __FILE__)
   gem 'elasticsearch-api', path: File.expand_path('../../elasticsearch-api', __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
-
 group :development do
   gem 'rspec'
   if defined?(JRUBY_VERSION)

diff --git a/Rakefile b/Rakefile
@@ -55,22 +55,6 @@ namespace :test do
     Rake::Task['test:unit'].invoke
     Rake::Task['test:integration'].invoke
   end
-
-  namespace :cluster do
-    desc "Start Elasticsearch nodes for tests"
-    task :start do
-      $LOAD_PATH << File.expand_path('../../elasticsearch-transport/lib', __FILE__) << File.expand_path('../test', __FILE__)
-      require 'elasticsearch/extensions/test/cluster'
-      Elasticsearch::Extensions::Test::Cluster.start
-    end
-
-    desc "Stop Elasticsearch nodes for tests"
-    task :stop do
-      $LOAD_PATH << File.expand_path('../../elasticsearch-transport/lib', __FILE__) << File.expand_path('../test', __FILE__)
-      require 'elasticsearch/extensions/test/cluster'
-      Elasticsearch::Extensions::Test::Cluster.stop
-    end
-  end
 end
 
 # ----- Documentation tasks ---------------------------------------------------

diff --git a/elasticsearch-dsl.gemspec b/elasticsearch-dsl.gemspec
@@ -49,7 +49,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.3'
 
   s.add_development_dependency 'elasticsearch'
-  s.add_development_dependency 'elasticsearch-extensions'
 
   s.add_development_dependency 'cane'
   s.add_development_dependency 'minitest', '~> 5'

diff --git a/test/integration/search_aggregation_children_test.rb b/test/integration/search_aggregation_children_test.rb
@@ -23,10 +23,6 @@ class ChildrenAggregationIntegrationTest < ::Elasticsearch::Test::IntegrationTes
       include Elasticsearch::DSL::Search
 
       context "A children aggregation" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'articles-and-comments', body: {
               mappings: {

diff --git a/test/integration/search_aggregation_geo_test.rb b/test/integration/search_aggregation_geo_test.rb
@@ -23,10 +23,6 @@ class GeoAggregationIntegrationTest < ::Elasticsearch::Test::IntegrationTestCase
       include Elasticsearch::DSL::Search
 
       context "A geo aggregation" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'venues-test', body: {
               mappings: {

diff --git a/test/integration/search_aggregation_nested_test.rb b/test/integration/search_aggregation_nested_test.rb
@@ -23,10 +23,6 @@ class NestedAggregationIntegrationTest < ::Elasticsearch::Test::IntegrationTestC
       include Elasticsearch::DSL::Search
 
       context "A nested aggregation" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'products-test', body: {
               mappings: {

diff --git a/test/integration/search_filters_test.rb b/test/integration/search_filters_test.rb
@@ -25,10 +25,6 @@ class FiltersIntegrationTest < ::Elasticsearch::Test::IntegrationTestCase
       include Elasticsearch::DSL::Search
 
       context "Filters integration" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'test'
           @client.index index: 'test', id: 1,

diff --git a/test/integration/search_query_test.rb b/test/integration/search_query_test.rb
@@ -23,10 +23,6 @@ class QueryIntegrationTest < ::Elasticsearch::Test::IntegrationTestCase
       include Elasticsearch::DSL::Search
 
       context "Queries integration" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'test'
           @client.index index: 'test', id: '1', body: { title: 'Test', tags: ['one'] }

diff --git a/test/integration/search_sort_test.rb b/test/integration/search_sort_test.rb
@@ -23,10 +23,6 @@ class SortingIntegrationTest < ::Elasticsearch::Test::IntegrationTestCase
       include Elasticsearch::DSL::Search
 
       context "Sorting integration" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'test'
           @client.index index: 'test', id: '1', body: { tags: ['one'], clicks: 15 }

diff --git a/test/integration/search_suggest_test.rb b/test/integration/search_suggest_test.rb
@@ -25,10 +25,6 @@ class SuggestIntegrationTest < ::Elasticsearch::Test::IntegrationTestCase
       include Elasticsearch::DSL::Search
 
       context "Suggest integration" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'test', body: {
               mappings: {

diff --git a/test/integration/search_test.rb b/test/integration/search_test.rb
@@ -50,10 +50,6 @@ def search_definition
       end
 
       context "The Search class" do
-        startup do
-          Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 1) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-        end
-
         setup do
           @client.indices.create index: 'test'
           @client.index index: 'test', id: '1', body: { title: 'Test', tags: ['one'] }

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -30,8 +30,6 @@
   SimpleCov.start { add_filter "/test|test_" }
 end
 
-at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
-
 require 'minitest/autorun'
 require 'shoulda-context'
 require 'mocha/setup'
@@ -43,10 +41,9 @@
 #                            Minitest::Reporters::HtmlReporter.new ]
 
 require 'elasticsearch'
-require 'elasticsearch/extensions/test/cluster'
-require 'elasticsearch/extensions/test/startup_shutdown'
-
 require 'elasticsearch/dsl'
+require 'logger'
+require 'ansi'
 
 module Elasticsearch
   module Test
@@ -67,20 +64,6 @@ class IntegrationTestCase < ::Minitest::Test
       alias_method :assert_not_nil, :refute_nil
       alias_method :assert_raise, :assert_raises
 
-      include Elasticsearch::Extensions::Test
-      extend  StartupShutdown
-
-      startup do
-        Cluster.start(number_of_nodes: 1) if ENV['SERVER'] \
-                                && ! Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 1)
-      end
-
-      shutdown do
-        Cluster.stop if ENV['SERVER'] \
-                     && started?      \
-                     && Elasticsearch::Extensions::Test::Cluster.running?
-      end
-
       def setup
         @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i