Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:binarylogic/authlogic_example
Browse files Browse the repository at this point in the history
  • Loading branch information
binarylogic committed Jun 20, 2009
2 parents 1e18650 + b0a1d95 commit 9b22672
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion test/fixtures/users.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ ben:
password_salt: <%= salt = Authlogic::Random.hex_token %>
crypted_password: <%= Authlogic::CryptoProviders::Sha512.encrypt("benrocks" + salt) %>
persistence_token: 6cde0674657a8a313ce952df979de2830309aa4c11ca65805dd00bfdc65dbcc2f5e36718660a1d2e68c1a08c276d996763985d2f06fd3d076eb7bc4d97b1e317
email: ben@ben.com
2 changes: 1 addition & 1 deletion test/functional/users_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class UsersControllerTest < ActionController::TestCase

test "should create user" do
assert_difference('User.count') do
post :create, :user => { :login => "ben", :password => "benrocks", :password_confirmation => "benrocks", :email => "myemail@email.com" }
post :create, :user => { :login => "ben", :password => "benrocks", :password_confirmation => "benrocks" }
end

assert_redirected_to account_path
Expand Down

0 comments on commit 9b22672

Please sign in to comment.