Skip to content

Commit

Permalink
Require Faraday >= 1.0, upgrade slack-ruby-danger.
Browse files Browse the repository at this point in the history
  • Loading branch information
dblock committed May 9, 2020
1 parent 225c71e commit 9f6de6d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
### 0.14.7 (Next)
### 0.15.0 (Next)

* [#323](https://github.com/slack-ruby/slack-ruby-client/pull/322): Require Faraday >= 1.0 - [@dblock](https://github.com/dblock).
* [#323](https://github.com/slack-ruby/slack-ruby-client/pull/322): Upgrade slack-ruby-danger to 0.2.0 - [@dblock](https://github.com/dblock).
* [#322](https://github.com/slack-ruby/slack-ruby-client/pull/322): Cache `Faraday::Connection` for persistent adapters - [@drbrain](https://github.com/drbrain).
* Your contribution here.

Expand Down
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# frozen_string_literal: true

danger.import_dangerfile(gem: 'slack-ruby-danger')
toc.check
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ if ENV.key?('CONCURRENCY')
end

group :test do
gem 'danger-toc', '~> 0.1.3', require: false
gem 'slack-ruby-danger', '~> 0.1.0', require: false
gem 'slack-ruby-danger', '~> 0.2.0', require: false
end
2 changes: 1 addition & 1 deletion lib/slack/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Slack
VERSION = '0.14.7'
VERSION = '0.15.0'
end
2 changes: 1 addition & 1 deletion slack-ruby-client.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.licenses = ['MIT']
s.summary = 'Slack Web and RealTime API client.'
s.add_dependency 'activesupport'
s.add_dependency 'faraday', '>= 0.9'
s.add_dependency 'faraday', '>= 1.0'
s.add_dependency 'faraday_middleware'
s.add_dependency 'gli'
s.add_dependency 'hashie'
Expand Down
4 changes: 2 additions & 2 deletions spec/slack/web/api/errors/service_unavailable_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
vcr: { cassette_name: 'web/503_error' } do
begin
client.auth_test
raise 'Expected to receive Faraday::ClientError.'
rescue Faraday::ClientError => e
raise 'Expected to receive Faraday::ServerError.'
rescue Faraday::ServerError => e
expect(e.response).not_to be_nil
expect(e.response[:status]).to eq 503
end
Expand Down

0 comments on commit 9f6de6d

Please sign in to comment.