1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00

Fix failing tests.

This commit is contained in:
José Valim 2010-11-09 22:27:46 +01:00
parent 835d1044ae
commit 931b902583
3 changed files with 7 additions and 8 deletions

View file

@ -2,7 +2,7 @@ source "http://rubygems.org"
gemspec gemspec
gem "rails", "3.0.0" gem "rails"
gem "webrat", "0.7.1" gem "webrat", "0.7.1"
gem "mocha", :require => false gem "mocha", :require => false
gem "oa-oauth", :require => "omniauth/oauth" gem "oa-oauth", :require => "omniauth/oauth"
@ -14,9 +14,8 @@ end
platforms :ruby do platforms :ruby do
gem "sqlite3-ruby" gem "sqlite3-ruby"
if RUBY_VERSION < '1.9' gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
gem "ruby-debug", ">= 0.10.3"
end
group :mongoid do group :mongoid do
gem "mongo", "1.0.7" gem "mongo", "1.0.7"
gem "mongoid", "2.0.0.beta.18" gem "mongoid", "2.0.0.beta.18"

View file

@ -126,7 +126,7 @@ GEM
ruby-openid (2.1.8) ruby-openid (2.1.8)
ruby-openid-apps-discovery (1.2.0) ruby-openid-apps-discovery (1.2.0)
ruby-openid (>= 2.1.7) ruby-openid (>= 2.1.7)
sqlite3-ruby (1.3.2) sqlite3-ruby (1.3.1)
thor (0.14.4) thor (0.14.4)
treetop (1.4.8) treetop (1.4.8)
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
@ -155,7 +155,7 @@ DEPENDENCIES
oa-oauth oa-oauth
oa-openid oa-openid
orm_adapter (~> 0.0.2) orm_adapter (~> 0.0.2)
rails (= 3.0.0) rails
ruby-debug (>= 0.10.3) ruby-debug (>= 0.10.3)
sqlite3-ruby sqlite3-ruby
warden (~> 1.0.0) warden (~> 1.0.0)

View file

@ -15,11 +15,11 @@ module Devise
end end
def check_if_allow_stubs! def check_if_allow_stubs!
raise "#{@provider} OmniAuth strategy does not allow stubs, only OAuth2 ones." unless allow_stubs? raise "OmniAuth strategy for #{@provider} does not allow stubs, only OAuth2 ones do." unless allow_stubs?
end end
def allow_stubs? def allow_stubs?
!(defined?(OmniAuth::Strategies::OAuth2) && strategy.is_a?(OmniAuth::Strategies::OAuth2)) defined?(::OmniAuth::Strategies::OAuth2) && strategy.is_a?(::OmniAuth::Strategies::OAuth2)
end end
def build_connection(&block) def build_connection(&block)