Skip to content

Commit bc0e4af

Browse files
committed
Update to Faraday 1.0
1 parent f5de51e commit bc0e4af

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

elasticsearch-api/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace :test do
7373
es_version_info = client.info['version']
7474
build_hash = es_version_info['build_hash']
7575
cluster_running = true
76-
rescue Faraday::Error::ConnectionFailed
76+
rescue Faraday::ConnectionFailed
7777
STDERR.puts "[!] Test cluster not running?"
7878
cluster_running = false
7979
end

elasticsearch-transport/elasticsearch-transport.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
2323
s.required_ruby_version = '>= 2.4'
2424

2525
s.add_dependency 'multi_json'
26-
s.add_dependency 'faraday', '>= 0.14', '< 1'
26+
s.add_dependency 'faraday', '~> 1'
2727
s.add_development_dependency 'ansi'
2828
s.add_development_dependency 'bundler'
2929
s.add_development_dependency 'elasticsearch-extensions'

elasticsearch-transport/lib/elasticsearch/transport/transport/http/faraday.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def __build_connection(host, options={}, block=nil)
4343
# @return [Array]
4444
#
4545
def host_unreachable_exceptions
46-
[::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError]
46+
[::Faraday::ConnectionFailed, ::Faraday::TimeoutError]
4747
end
4848
end
4949
end

elasticsearch-transport/spec/elasticsearch/transport/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@
832832
expect(client.perform_request('GET', '_nodes/_local'))
833833
expect {
834834
client.perform_request('GET', '_nodes/_local')
835-
}.to raise_exception(Faraday::Error::ConnectionFailed)
835+
}.to raise_exception(Faraday::ConnectionFailed)
836836
end
837837
end
838838

0 commit comments

Comments
 (0)