aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_edit.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-08-25 13:23:27 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-08-25 13:23:27 -0500
commit6c3d383bbb0af1ca7ac2ec2b229d148e947608dd (patch)
tree6e59e531bf5a2932d2282de305f96d4c54b297c7 /mediagoblin/tests/test_edit.py
parente8eec575f3a1d893036ce9b3356d2f56fd15016d (diff)
parentc9f9536cdf32ef597216af0ca7ba25adee799dbb (diff)
downloadmediagoblin-6c3d383bbb0af1ca7ac2ec2b229d148e947608dd.tar.lz
mediagoblin-6c3d383bbb0af1ca7ac2ec2b229d148e947608dd.tar.xz
mediagoblin-6c3d383bbb0af1ca7ac2ec2b229d148e947608dd.zip
Merge remote-tracking branch 'refs/remotes/rodney757/email'
Diffstat (limited to 'mediagoblin/tests/test_edit.py')
-rw-r--r--mediagoblin/tests/test_edit.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py
index d70d0478..c43a3a42 100644
--- a/mediagoblin/tests/test_edit.py
+++ b/mediagoblin/tests/test_edit.py
@@ -147,26 +147,26 @@ class TestUserEdit(object):
# Test email already in db
template.clear_test_template_context()
test_app.post(
- '/edit/account/', {
+ '/edit/email/', {
'new_email': 'chris@example.com',
'password': 'toast'})
# Check form errors
context = template.TEMPLATE_TEST_CONTEXT[
- 'mediagoblin/edit/edit_account.html']
+ 'mediagoblin/edit/change_email.html']
assert context['form'].new_email.errors == [
u'Sorry, a user with that email address already exists.']
# Test successful email change
template.clear_test_template_context()
res = test_app.post(
- '/edit/account/', {
+ '/edit/email/', {
'new_email': 'new@example.com',
'password': 'toast'})
res.follow()
# Correct redirect?
- assert urlparse.urlsplit(res.location)[2] == '/u/chris/'
+ assert urlparse.urlsplit(res.location)[2] == '/edit/account/'
# Make sure we get email verification and try verifying
assert len(mail.EMAIL_TEST_INBOX) == 1