Updating devise to be compatible with latest mongoid
This commit is contained in:
parent
c6240dd7eb
commit
1e79f5bcfd
2
Gemfile
2
Gemfile
@ -11,7 +11,7 @@ gem 'mongoid', "2.0.0.beta11"
|
||||
gem 'mongoid_acts_as_tree', '0.1.5'
|
||||
gem 'mongo_session_store', '2.0.0.pre'
|
||||
gem 'warden'
|
||||
gem 'devise', '1.1.rc1'
|
||||
gem 'devise', '1.1.rc2'
|
||||
gem 'haml', '3.0.13'
|
||||
gem 'rmagick', '2.12.2'
|
||||
gem 'aws'
|
||||
|
@ -55,6 +55,7 @@ GEM
|
||||
http_connection
|
||||
uuidtools
|
||||
xml-simple
|
||||
bcrypt-ruby (2.1.2)
|
||||
bson (1.0.4)
|
||||
bson_ext (1.0.4)
|
||||
builder (2.1.2)
|
||||
@ -80,8 +81,9 @@ GEM
|
||||
cucumber (>= 0.8.0)
|
||||
culerity (0.2.10)
|
||||
daemons (1.1.0)
|
||||
devise (1.1.rc1)
|
||||
warden (~> 0.10.3)
|
||||
devise (1.1.rc2)
|
||||
bcrypt-ruby (~> 2.1.2)
|
||||
warden (~> 0.10.7)
|
||||
diff-lcs (1.1.2)
|
||||
erubis (2.6.6)
|
||||
abstract (>= 1.0.0)
|
||||
@ -226,7 +228,7 @@ DEPENDENCIES
|
||||
cgi_multipart_eof_fix
|
||||
cucumber
|
||||
cucumber-rails
|
||||
devise (= 1.1.rc1)
|
||||
devise (= 1.1.rc2)
|
||||
factory_girl_rails
|
||||
fastthread
|
||||
formtastic!
|
||||
|
@ -63,7 +63,7 @@ Devise.setup do |config|
|
||||
# authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
|
||||
# stretches above to 20 for default behavior) and :restful_authentication_sha1
|
||||
# (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
|
||||
# config.encryptor = :sha1
|
||||
config.encryptor = :sha1
|
||||
|
||||
# ==> Configuration for :confirmable
|
||||
# The time you want give to your user to confirm his account. During this time
|
||||
|
@ -9,6 +9,7 @@ Scenario: Successful authentication
|
||||
And I fill in "admin_email" with "admin@locomotiveapp.org"
|
||||
And I fill in "admin_password" with "easyone"
|
||||
And I press "Log in"
|
||||
And Show me the page
|
||||
Then I should see "Listing pages"
|
||||
|
||||
Scenario: Failed authentication
|
||||
|
Loading…
Reference in New Issue
Block a user