Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api-spec-testing/test_file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@ def clear_datastreams(client)
client.xpack.indices.delete_data_stream(name: datastream['name'], expand_wildcards: 'all')
end
begin
client.indices.delete_data_stream(name: '*', expand_wildcards: 'all')
client.xpack.indices.delete_data_stream(name: '*', expand_wildcards: 'all')
rescue StandardError => e
LOGGER.error "Caught exception attempting to delete data streams: #{e}"
client.indices.delete_data_stream(name: '*')
client.xpack.indices.delete_data_stream(name: '*')
end
end

Expand Down
3 changes: 1 addition & 2 deletions elasticsearch-api/lib/elasticsearch/api.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ def self.included(base)
Elasticsearch::API::Remote,
Elasticsearch::API::DanglingIndices,
Elasticsearch::API::Features,
Elasticsearch::API::Shutdown,
Elasticsearch::API::Security
Elasticsearch::API::Shutdown
end

# The serializer class
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

3 changes: 1 addition & 2 deletions elasticsearch-api/spec/rest_yaml_tests_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,8 @@
end
end


# Skipped tests
file = File.expand_path(__dir__ + '/skipped_tests.yml')
file = File.expand_path("#{__dir__}/skipped_tests.yml")
skipped_tests = YAML.load_file(file)

# The directory of rest api YAML files.
Expand Down
12 changes: 4 additions & 8 deletions elasticsearch-transport/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,12 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in elasticsearch-transport.gemspec
gemspec

if File.exist? File.expand_path('../../elasticsearch-api/elasticsearch-api.gemspec', __FILE__)
gem 'elasticsearch-api', path: File.expand_path('../../elasticsearch-api', __FILE__), require: false
if File.exist? File.expand_path('../elasticsearch-api/elasticsearch-api.gemspec', __dir__)
gem 'elasticsearch-api', path: File.expand_path('../elasticsearch-api', __dir__), require: false
end

if File.exist? File.expand_path('../../elasticsearch-extensions/elasticsearch-extensions.gemspec', __FILE__)
gem 'elasticsearch-extensions', path: File.expand_path('../../elasticsearch-extensions', __FILE__), require: false
end

if File.exist? File.expand_path('../../elasticsearch/elasticsearch.gemspec', __FILE__)
gem 'elasticsearch', path: File.expand_path('../../elasticsearch', __FILE__), require: false
if File.exist? File.expand_path('../elasticsearch/elasticsearch.gemspec', __dir__)
gem 'elasticsearch', path: File.expand_path('../elasticsearch', __dir__), require: false
end

group :development, :test do
Expand Down
Loading