Be more helpful in the already confirmed message, closes #613
This commit is contained in:
parent
976d77defe
commit
2aeaf4b109
|
@ -2,7 +2,7 @@ en:
|
||||||
errors:
|
errors:
|
||||||
messages:
|
messages:
|
||||||
not_found: "not found"
|
not_found: "not found"
|
||||||
already_confirmed: "was already confirmed"
|
already_confirmed: "was already confirmed, please try signing in"
|
||||||
not_locked: "was not locked"
|
not_locked: "was not locked"
|
||||||
not_saved:
|
not_saved:
|
||||||
one: "1 error prohibited this %{resource} from being saved:"
|
one: "1 error prohibited this %{resource} from being saved:"
|
||||||
|
|
|
@ -48,7 +48,7 @@ class ConfirmableTest < ActiveSupport::TestCase
|
||||||
assert_blank user.errors[:email]
|
assert_blank user.errors[:email]
|
||||||
|
|
||||||
assert_not user.confirm!
|
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
|
end
|
||||||
|
|
||||||
test 'should find and confirm an user automatically' do
|
test 'should find and confirm an user automatically' do
|
||||||
|
@ -76,7 +76,7 @@ class ConfirmableTest < ActiveSupport::TestCase
|
||||||
user.save
|
user.save
|
||||||
confirmed_user = User.confirm_by_token(user.confirmation_token)
|
confirmed_user = User.confirm_by_token(user.confirmation_token)
|
||||||
assert confirmed_user.confirmed?
|
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
|
end
|
||||||
|
|
||||||
test 'should send confirmation instructions by email' do
|
test 'should send confirmation instructions by email' do
|
||||||
|
@ -160,7 +160,7 @@ class ConfirmableTest < ActiveSupport::TestCase
|
||||||
user.confirm!
|
user.confirm!
|
||||||
assert_not user.resend_confirmation_token
|
assert_not user.resend_confirmation_token
|
||||||
assert user.confirmed?
|
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
|
end
|
||||||
|
|
||||||
test 'confirm time should fallback to devise confirm in default configuration' do
|
test 'confirm time should fallback to devise confirm in default configuration' do
|
||||||
|
|
Loading…
Reference in New Issue