You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/06/03 17:13:16 UTC
git commit: [#7410] whitespace fixes for templatized email
Repository: allura
Updated Branches:
refs/heads/master 5e94ea5af -> cf55cdddb
[#7410] whitespace fixes for templatized email
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cf55cddd
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cf55cddd
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cf55cddd
Branch: refs/heads/master
Commit: cf55cdddb8fe4c27de98c275c3461f6ef4cbd409
Parents: 5e94ea5
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Jun 3 15:12:46 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue Jun 3 15:12:46 2014 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_auth.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/cf55cddd/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 aaadd13..0d4f8f7 100644
--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -676,14 +676,11 @@ class TestPasswordReset(TestController):
provider = plugin.LocalAuthenticationProvider(None)
assert_true(provider._validate_password(user, new_password))
- text = '''
-Your username is test-admin
+ text = '''Your username is test-admin
To reset your password on %s, please visit the following URL:
-%s/auth/forgotten_password/%s
-
-''' % (config['site_name'], config['base_url'], hash)
+%s/auth/forgotten_password/%s''' % (config['site_name'], config['base_url'], hash)
sendmail.post.assert_called_once_with(
destinations=[email._id],