summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Dougherty <thegeekofalltrades@gmail.com>2014-09-23 15:13:44 -0700
committerMatt Dougherty <thegeekofalltrades@gmail.com>2014-09-23 15:13:44 -0700
commit13e28ab0d5e81839936ef304979fe7927b650f05 (patch)
tree04d986c213f966686ebe4b6285ef680de2e325b9
parent178f4e1a95c038ccfe4cb821c5ca2acca4c6b4ae (diff)
downloadaskbot-13e28ab0d5e81839936ef304979fe7927b650f05.tar.gz
askbot-13e28ab0d5e81839936ef304979fe7927b650f05.tar.bz2
askbot-13e28ab0d5e81839936ef304979fe7927b650f05.zip
[settings_agnostic_email_tests] Make two UserProfilePageTests email tests settings-agnostic.
-rw-r--r--askbot/tests/page_load_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/askbot/tests/page_load_tests.py b/askbot/tests/page_load_tests.py
index 9b16f58b..a0b2e2cc 100644
--- a/askbot/tests/page_load_tests.py
+++ b/askbot/tests/page_load_tests.py
@@ -774,7 +774,7 @@ class UserProfilePageTests(AskbotTestCase):
def setUp(self):
self.user = self.create_user('user')
- @with_settings(EDITABLE_EMAIL=False)
+ @with_settings(EDITABLE_EMAIL=False, EDITABLE_SCREEN_NAME=True)
def test_user_cannot_change_email(self):
#log in
self.client.login(user_id=self.user.id, method='force')
@@ -791,7 +791,7 @@ class UserProfilePageTests(AskbotTestCase):
self.assertEqual(user.username, 'edited')
self.assertEqual(user.email, email_before)
- @with_settings(EDITABLE_EMAIL=True)
+ @with_settings(EDITABLE_EMAIL=True, EDITABLE_SCREEN_NAME=True)
def test_user_can_change_email(self):
self.client.login(user_id=self.user.id, method='force')
email_before = self.user.email