Skip to content

Commit 2bc91ea

Browse files
committed
Update to Faraday 1.0
1 parent fdab299 commit 2bc91ea

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
@@ -69,7 +69,7 @@ namespace :test do
6969
es_version_info = client.info['version']
7070
build_hash = es_version_info['build_hash']
7171
cluster_running = true
72-
rescue Faraday::Error::ConnectionFailed
72+
rescue Faraday::ConnectionFailed
7373
STDERR.puts "[!] Test cluster not running?"
7474
cluster_running = false
7575
end

elasticsearch-transport/elasticsearch-transport.gemspec

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

2929
s.add_dependency 'multi_json'
30-
s.add_dependency 'faraday', '>= 0.14', '< 1'
30+
s.add_dependency 'faraday', '~> 1'
3131

3232
s.add_development_dependency 'cane'
3333
s.add_development_dependency 'curb' unless defined? JRUBY_VERSION

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __build_connection(host, options={}, block=nil)
4848
# @return [Array]
4949
#
5050
def host_unreachable_exceptions
51-
[::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError]
51+
[::Faraday::ConnectionFailed, ::Faraday::TimeoutError]
5252
end
5353

5454
private

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@
12751275
expect(client.perform_request('GET', '_nodes/_local'))
12761276
expect {
12771277
client.perform_request('GET', '_nodes/_local')
1278-
}.to raise_exception(Faraday::Error::ConnectionFailed)
1278+
}.to raise_exception(Faraday::ConnectionFailed)
12791279
end
12801280
end
12811281

0 commit comments

Comments
 (0)