Skip to content

Commit 3b59acf

Browse files
committed
Require Faraday >= 1.0.
1 parent 010a0cc commit 3b59acf

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.travis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ matrix:
77
- rvm: 2.6.5
88
script:
99
- bundle exec danger
10-
- rvm: 2.3.0
10+
- rvm: 2.4.0
1111
env: CONCURRENCY=celluloid-io
12-
- rvm: 2.3.0
12+
- rvm: 2.4.0
1313
env: CONCURRENCY=faye-websocket
14-
- rvm: 2.3.0
14+
- rvm: 2.4.0
1515
env: CONCURRENCY=async-websocket
1616
- rvm: 2.6.5
1717
env: CONCURRENCY=celluloid-io

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* [#264](https://github.com/slack-ruby/slack-ruby-bot/pull/264): Added TOC to README - [@dblock](https://github.com/dblock).
66
* [#265](https://github.com/slack-ruby/slack-ruby-bot/pull/265): Made `allow_bot_messages` and `allow_message_loops` available in `SlackRubyBot::Client` - [@dblock](https://github.com/dblock).
77
* [#266](https://github.com/slack-ruby/slack-ruby-bot/pull/266): Removed deprecated `Server#hooks` - [@dblock](https://github.com/dblock).
8+
* [#267](https://github.com/slack-ruby/slack-ruby-bot/pull/267): Require Faraday >= 1.0 - [@dblock](https://github.com/dblock).
89
* Your contribution here.
910

1011
### 0.15.0 (2020/5/8)

Gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ if ENV.key?('CONCURRENCY')
1414
end
1515

1616
group :test do
17-
gem 'danger-toc', '~> 0.2.0', require: false
18-
gem 'slack-ruby-danger', '~> 0.1.0', require: false
17+
gem 'slack-ruby-danger', '~> 0.2.0', require: false
1918
end

lib/slack-ruby-bot/server.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def handle_exceptions
5656
else
5757
raise e
5858
end
59-
rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed, Faraday::Error::SSLError => e
59+
rescue Faraday::TimeoutError, Faraday::ConnectionFailed, Faraday::SSLError => e
6060
logger.error e
6161
sleep 1 # ignore, try again
6262
rescue StandardError => e

spec/slack-ruby-bot/server_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
subject.run
5757
end.to raise_error Slack::Web::Api::Error, 'unknown'
5858
end
59-
[Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, Faraday::Error::SSLError].each do |err|
59+
[Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::SSLError].each do |err|
6060
it err.to_s do
6161
expect(client).to receive(:start!) { raise err, 'Faraday' }
6262
expect(client).to receive(:start!) { raise 'unknown' }

0 commit comments

Comments
 (0)