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

Be more helpful in the already confirmed message, closes #613

Browse source
This commit is contained in:
José Valim 2010-11-05 10:03:52 -02:00
parent 976d77defe
commit 2aeaf4b109
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/locales/en.yml
View file

@ -2,7 +2,7 @@ en:
errors:
messages:
not_found: "not found"
already_confirmed: "was already confirmed"
already_confirmed: "was already confirmed, please try signing in"
not_locked: "was not locked"
not_saved:
one: "1 error prohibited this %{resource} from being saved:"

6
test/models/confirmable_test.rb
View file

@ -48,7 +48,7 @@ class ConfirmableTest < ActiveSupport::TestCase
assert_blank user.errors[:email]
assert_not user.confirm!
assert_equal "was already confirmed", user.errors[:email].join
assert_equal "was already confirmed, please try signing in", user.errors[:email].join
end
test 'should find and confirm an user automatically' do
@ -76,7 +76,7 @@ class ConfirmableTest < ActiveSupport::TestCase
user.save
confirmed_user = User.confirm_by_token(user.confirmation_token)
assert confirmed_user.confirmed?
assert_equal "was already confirmed", confirmed_user.errors[:email].join
assert_equal "was already confirmed, please try signing in", confirmed_user.errors[:email].join
end
test 'should send confirmation instructions by email' do
@ -160,7 +160,7 @@ class ConfirmableTest < ActiveSupport::TestCase
user.confirm!
assert_not user.resend_confirmation_token
assert user.confirmed?
assert_equal 'was already confirmed', user.errors[:email].join
assert_equal 'was already confirmed, please try signing in', user.errors[:email].join
end
test 'confirm time should fallback to devise confirm in default configuration' do