Skip to content

Commit

Permalink
Merge pull request #1564 from alexandermendes/master
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
therealmarv committed Jul 24, 2017
2 parents 480b51a + a549c3c commit 2f6c9cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pybossa/view/account.py
Expand Up @@ -653,7 +653,7 @@ def forgot_password():
'/account/email/forgot_password.html',
user=user, recovery_url=recovery_url)
mail_queue.enqueue(send_mail, msg)
flash(gettext("We've send you an email with account "
flash(gettext("We've sent you an email with account "
"recovery instructions!"),
'success')
else:
Expand Down
8 changes: 4 additions & 4 deletions test/test_web.py
Expand Up @@ -3691,7 +3691,7 @@ def test_45_password_reset_link_json(self, signer, queue):
assert 'To recover your password' in enqueue_call[0][1]['html']
err_msg = "There should be a flash message"
assert resdata.get('flash'), err_msg
assert "send you an email" in resdata.get('flash'), err_msg
assert "sent you an email" in resdata.get('flash'), err_msg

data = {'password': jane.passwd_hash, 'user': jane.name}
csrf = self.get_csrf('/account/forgot-password')
Expand All @@ -3709,7 +3709,7 @@ def test_45_password_reset_link_json(self, signer, queue):
assert 'your Twitter account to ' in enqueue_call[0][1]['html']
err_msg = "There should be a flash message"
assert resdata.get('flash'), err_msg
assert "send you an email" in resdata.get('flash'), err_msg
assert "sent you an email" in resdata.get('flash'), err_msg

data = {'password': google.passwd_hash, 'user': google.name}
csrf = self.get_csrf('/account/forgot-password')
Expand All @@ -3727,7 +3727,7 @@ def test_45_password_reset_link_json(self, signer, queue):
assert 'your Google account to ' in enqueue_call[0][1]['html']
err_msg = "There should be a flash message"
assert resdata.get('flash'), err_msg
assert "send you an email" in resdata.get('flash'), err_msg
assert "sent you an email" in resdata.get('flash'), err_msg

data = {'password': facebook.passwd_hash, 'user': facebook.name}
csrf = self.get_csrf('/account/forgot-password')
Expand All @@ -3743,7 +3743,7 @@ def test_45_password_reset_link_json(self, signer, queue):
assert 'your Facebook account to ' in enqueue_call[0][1]['html']
err_msg = "There should be a flash message"
assert resdata.get('flash'), err_msg
assert "send you an email" in resdata.get('flash'), err_msg
assert "sent you an email" in resdata.get('flash'), err_msg

# Test with not valid form
csrf = self.get_csrf('/account/forgot-password')
Expand Down

0 comments on commit 2f6c9cc

Please sign in to comment.