Skip to content

Commit 63078a3

Browse files
Ryo TakahashiRyo Takahashi
authored andcommitted
Backport: Fix spec for support faraday 2 (#561)
Co-authored-by: Ryo Takahashi <[email protected]>
1 parent 7445afc commit 63078a3

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gemspec
66

77
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
88

9-
gem 'faraday', ['>= 0.8', '< 2.0'], :platforms => [:jruby_18, :ruby_18]
9+
gem 'faraday', ['>= 0.8', '< 3.0'], :platforms => [:jruby_18, :ruby_18]
1010
gem 'jwt'
1111
gem 'overcommit'
1212
gem 'rake'

oauth2.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
55
require 'oauth2/version'
66

77
Gem::Specification.new do |spec|
8-
spec.add_dependency 'faraday', ['>= 0.8', '< 2.0']
8+
spec.add_dependency 'faraday', ['>= 0.8', '< 3.0']
99
spec.add_dependency 'jwt', ['>= 1.0', '< 3.0']
1010
spec.add_dependency 'multi_json', '~> 1.3'
1111
spec.add_dependency 'multi_xml', '~> 0.5'

spec/oauth2/client_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ def stubbed_client(params = {}, &stubs)
517517
context 'with SSL options' do
518518
subject do
519519
cli = described_class.new('abc', 'def', :site => 'https://api.example.com', :ssl => {:ca_file => 'foo.pem'})
520-
cli.connection.build do |b|
520+
cli.connection = Faraday.new(cli.site, cli.options[:connection_opts]) do |b|
521521
b.adapter :test
522522
end
523523
cli

spec/oauth2/strategy/assertion_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
let(:client) do
55
cli = OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com')
6-
cli.connection.build do |b|
6+
cli.connection = Faraday.new(cli.site, cli.options[:connection_opts]) do |b|
7+
b.request :url_encoded
78
b.adapter :test do |stub|
89
stub.post('/oauth/token') do |env|
910
case @mode

spec/oauth2/strategy/password_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
let(:client) do
55
cli = OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com')
6-
cli.connection.build do |b|
6+
cli.connection = Faraday.new(cli.site, cli.options[:connection_opts]) do |b|
7+
b.request :url_encoded
78
b.adapter :test do |stub|
89
stub.post('/oauth/token') do |env|
910
case @mode

0 commit comments

Comments
 (0)