Skip to content

Commit 8ece4bb

Browse files
committed
Merge branch 'add-info-to-error' of github.com:jjulian/omniauth-oauth2 into jjulian-add-info-to-error
2 parents b59e772 + d05e894 commit 8ece4bb

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

lib/omniauth/strategies/oauth2.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,10 @@ def initialize(error, error_reason=nil, error_uri=nil)
110110
self.error_reason = error_reason
111111
self.error_uri = error_uri
112112
end
113+
114+
def message
115+
[self.error, self.error_reason, self.error_uri].compact.join(' | ')
116+
end
113117
end
114118
end
115119
end

spec/omniauth/strategies/oauth2_spec.rb

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,20 @@ def app; lambda{|env| [200, {}, ["Hello."]]} end
6262
end
6363
end
6464
end
65+
66+
describe OmniAuth::Strategies::OAuth2::CallbackError do
67+
let(:error){ Class.new(OmniAuth::Strategies::OAuth2::CallbackError) }
68+
describe '#message' do
69+
subject { error }
70+
it "should include all of the attributes" do
71+
instance = subject.new('error', 'description', 'uri')
72+
instance.message.should =~ /error/
73+
instance.message.should =~ /description/
74+
instance.message.should =~ /uri/
75+
end
76+
it "should include all of the attributes" do
77+
instance = subject.new(nil, :symbol)
78+
instance.message.should == 'symbol'
79+
end
80+
end
81+
end

0 commit comments

Comments
 (0)