github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating devise to be compatible with latest mongoid

Browse Source
This commit is contained in:
Jacques Crocker 2010-07-26 00:59:02 -07:00
parent c6240dd7eb
commit 1e79f5bcfd
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -11,7 +11,7 @@ gem 'mongoid', "2.0.0.beta11"
gem 'mongoid_acts_as_tree', '0.1.5' gem 'mongoid_acts_as_tree', '0.1.5'
gem 'mongo_session_store', '2.0.0.pre' gem 'mongo_session_store', '2.0.0.pre'
gem 'warden' gem 'warden'
gem 'devise', '1.1.rc1' gem 'devise', '1.1.rc2'
gem 'haml', '3.0.13' gem 'haml', '3.0.13'
gem 'rmagick', '2.12.2' gem 'rmagick', '2.12.2'
gem 'aws' gem 'aws'

8
Gemfile.lock
View File

@ -55,6 +55,7 @@ GEM
http_connection http_connection
uuidtools uuidtools
xml-simple xml-simple
bcrypt-ruby (2.1.2)
bson (1.0.4) bson (1.0.4)
bson_ext (1.0.4) bson_ext (1.0.4)
builder (2.1.2) builder (2.1.2)
@ -80,8 +81,9 @@ GEM
cucumber (>= 0.8.0) cucumber (>= 0.8.0)
culerity (0.2.10) culerity (0.2.10)
daemons (1.1.0) daemons (1.1.0)
devise (1.1.rc1) devise (1.1.rc2)
warden (~> 0.10.3) bcrypt-ruby (~> 2.1.2)
warden (~> 0.10.7)
diff-lcs (1.1.2) diff-lcs (1.1.2)
erubis (2.6.6) erubis (2.6.6)
abstract (>= 1.0.0) abstract (>= 1.0.0)
@ -226,7 +228,7 @@ DEPENDENCIES
cgi_multipart_eof_fix cgi_multipart_eof_fix
cucumber cucumber
cucumber-rails cucumber-rails
devise (= 1.1.rc1) devise (= 1.1.rc2)
factory_girl_rails factory_girl_rails
fastthread fastthread
formtastic! formtastic!

2
config/initializers/devise.rb
View File

@ -63,7 +63,7 @@ Devise.setup do |config|
# authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
# stretches above to 20 for default behavior) and :restful_authentication_sha1 # 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) # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
# config.encryptor = :sha1 config.encryptor = :sha1
# ==> Configuration for :confirmable # ==> Configuration for :confirmable
# The time you want give to your user to confirm his account. During this time # The time you want give to your user to confirm his account. During this time

7
features/admin/login.feature
View File

@ -1,14 +1,15 @@
@site_up @site_up
Feature: Login Feature: Login
In order to access locomotive admin panel In order to access locomotive admin panel
As an administrator As an administrator
I want to log in I want to log in
Scenario: Successful authentication Scenario: Successful authentication
When I go to login When I go to login
And I fill in "admin_email" with "admin@locomotiveapp.org" And I fill in "admin_email" with "admin@locomotiveapp.org"
And I fill in "admin_password" with "easyone" And I fill in "admin_password" with "easyone"
And I press "Log in" And I press "Log in"
And Show me the page
Then I should see "Listing pages" Then I should see "Listing pages"
Scenario: Failed authentication Scenario: Failed authentication