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

Merge pull request #2763 from paulanunda/master

Browse source 
Fixed small grammatical error in en.yml
This commit is contained in:
José Valim 2013-12-09 21:50:20 -08:00
commit 3adeba38f5
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

@ -28,7 +28,7 @@ en:
success: "Successfully authenticated from %{kind} account." success: "Successfully authenticated from %{kind} account."
passwords: passwords:
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes." send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes."
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
updated: "Your password was changed successfully. You are now signed in." updated: "Your password was changed successfully. You are now signed in."
updated_not_active: "Your password was changed successfully." updated_not_active: "Your password was changed successfully."

6
test/integration/recoverable_test.rb
View file

@ -39,7 +39,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
end end
assert_current_url '/users/sign_in' assert_current_url '/users/sign_in'
assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.' assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
end end
test 'reset password with email should send an email from a custom mailer' do test 'reset password with email should send an email from a custom mailer' do
@ -78,7 +78,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
end end
assert_current_url '/users/sign_in' assert_current_url '/users/sign_in'
assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.' assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
end end
test 'reset password with email with extra whitespace should fail when email is NOT the list of strip whitespace keys' do test 'reset password with email with extra whitespace should fail when email is NOT the list of strip whitespace keys' do
@ -111,7 +111,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
request_forgot_password request_forgot_password
assert_current_url '/users/sign_in' assert_current_url '/users/sign_in'
assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.' assert_contain 'You will receive an email with instructions on how to reset your password in a few minutes.'
end end
test 'not authenticated user with invalid email should receive an error message' do test 'not authenticated user with invalid email should receive an error message' do