allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/3] git commit: [#7410] ticket:594 Fix tests
Date Tue, 03 Jun 2014 14:56:55 GMT
Repository: allura
Updated Branches:
  refs/heads/master 291924f42 -> 5e94ea5af


[#7410] ticket:594 Fix tests


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/b2fb5f12
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b2fb5f12
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b2fb5f12

Branch: refs/heads/master
Commit: b2fb5f12ebef5cfc55801de1c08f9cfa8822d2fb
Parents: 57e8808
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu May 29 11:57:06 2014 +0300
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Tue Jun 3 14:40:39 2014 +0000

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_auth.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/b2fb5f12/Allura/allura/tests/functional/test_auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_auth.py b/Allura/allura/tests/functional/test_auth.py
index 751d406..aaadd13 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -665,6 +665,7 @@ class TestPasswordReset(TestController):
         assert hash_expiry is not None
 
         r = self.app.get('/auth/forgotten_password/%s' % hash)
+        assert_in('Enter a new password for: test-admin', r)
         assert_in('New Password:', r)
         assert_in('New Password (again):', r)
         form = r.forms[0]
@@ -676,6 +677,8 @@ class TestPasswordReset(TestController):
         assert_true(provider._validate_password(user, new_password))
 
         text = '''
+Your username is test-admin
+
 To reset your password on %s, please visit the following URL:
 
 %s/auth/forgotten_password/%s
@@ -686,7 +689,7 @@ To reset your password on %s, please visit the following URL:
             destinations=[email._id],
             fromaddr=config['forgemail.return_path'],
             reply_to=config['forgemail.return_path'],
-            subject='Password recovery',
+            subject='Allura Password recovery',
             message_id=gen_message_id(),
             text=text)
         user = M.User.query.get(username='test-admin')


Mime
View raw message