fixed regressions in users app

misago/users/tests/test_decorators.py

@@ -35,12 +35,14 @@ class DeflectGuestsTests(UserTestCase):
         """deflect_guests decorator allowed authenticated request"""
         self.login_user(self.get_authenticated_user())
 
-        response = self.client.post(
-            reverse('misago:usercp_change_forum_options'))
+        response = self.client.get(
+            reverse('misago:options_form',
+                    kwargs={'form_name': 'forum-options'}))
         self.assertEqual(response.status_code, 200)
 
     def test_fail(self):
         """deflect_guests decorator deflected authenticated request"""
-        response = self.client.post(
-            reverse('misago:usercp_change_forum_options'))
+        response = self.client.get(
+            reverse('misago:options_form',
+                    kwargs={'form_name': 'forum-options'}))
         self.assertEqual(response.status_code, 302)

misago/users/tests/test_misagoavatars_tags.py

@@ -14,19 +14,18 @@ class TemplateTagsTests(TestCase):
 
 {{ user|avatar }}
 {{ user|avatar:100 }}
-{{ user.pk|avatar }}
-{{ user.pk|avatar:100 }}
 """
 
         tpl = Template(tpl_content)
         render = tpl.render(Context({'user': user})).strip().splitlines()
 
         pk = user.pk
+        avatar_hash = user.avatar_hash
 
-        self.assertEqual(render[0].strip(), '/user-avatar/200/%s.png' % pk)
-        self.assertEqual(render[1].strip(), '/user-avatar/100/%s.png' % pk)
-        self.assertEqual(render[2].strip(), '/user-avatar/200/%s.png' % pk)
-        self.assertEqual(render[3].strip(), '/user-avatar/100/%s.png' % pk)
+        self.assertEqual(render[0].strip(),
+                         '/user-avatar/%s/200/%s.png' % (avatar_hash, pk))
+        self.assertEqual(render[1].strip(),
+                         '/user-avatar/%s/100/%s.png' % (avatar_hash, pk))
 
     def test_blankavatar_tag(self):
         """{% blankavatar %} tag returns url to default image"""

misago/users/tests/test_user_changeemail_api.py

@@ -54,7 +54,7 @@ class UserChangeEmailTests(AuthenticatedUserTestCase):
             'password': self.USER_PASSWORD
         })
         self.assertEqual(response.status_code, 400)
-        self.assertIn('enter new e-mail', response.content)
+        self.assertIn('new_email":["This field is required', response.content)
 
         response = self.client.post(self.link, data={
             'new_email': 'newmail',

misago/users/tests/test_user_changepassword_api.py

@@ -54,7 +54,8 @@ class UserChangePasswordTests(AuthenticatedUserTestCase):
             'password': self.USER_PASSWORD
         })
         self.assertEqual(response.status_code, 400)
-        self.assertIn('enter new password', response.content)
+        self.assertIn('new_password":["This field is required',
+                      response.content)
 
         response = self.client.post(self.link, data={
             'new_password': 'n',

misago/users/tests/test_usercp_views.py

@@ -1,66 +0,0 @@
-from path import Path
-
-from django.contrib.auth import get_user_model
-from django.core import mail
-from django.core.urlresolvers import reverse
-
-from misago.acl.testutils import override_acl
-from misago.conf import settings
-from misago.core import threadstore
-
-from misago.users.avatars import store
-from misago.users.testutils import AuthenticatedUserTestCase
-
-
-class ChangeEmailPasswordTests(AuthenticatedUserTestCase):
-    def setUp(self):
-        super(ChangeEmailPasswordTests, self).setUp()
-        self.view_link = reverse('misago:usercp_change_email_password')
-
-        threadstore.clear()
-
-    def _link_from_mail(self, mail_body):
-        for line in mail.outbox[0].body.splitlines():
-            if line.strip().startswith('http://testserver/'):
-                return line.strip()[len('http://testserver'):]
-        raise ValueError("mail body didn't contain link with token")
-
-    def test_change_email_password_get(self):
-        """GET to usercp change email/pass view returns 200"""
-        response = self.client.get(self.view_link)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('Change email or password', response.content)
-
-    def test_change_email(self):
-        """POST to usercp change email view returns 302"""
-        response = self.client.post(self.view_link,
-                                    data={'new_email': 'newmail@test.com',
-                                          'current_password': 'Pass.123'})
-        self.assertEqual(response.status_code, 302)
-
-        self.assertIn('Confirm changes to', mail.outbox[0].subject)
-        confirmation_link = self._link_from_mail(mail.outbox[0].body)
-
-        response = self.client.get(confirmation_link)
-        self.assertEqual(response.status_code, 302)
-
-        User = get_user_model()
-        User.objects.get(email='newmail@test.com')
-
-    def test_change_password(self):
-        """POST to usercp change password view returns 302"""
-        response = self.client.post(self.view_link,
-                                    data={'new_password': 'newpass123',
-                                          'current_password': 'Pass.123'})
-        self.assertEqual(response.status_code, 302)
-
-        self.assertIn('Confirm changes to', mail.outbox[0].subject)
-        confirmation_link = self._link_from_mail(mail.outbox[0].body)
-
-        response = self.client.get(confirmation_link)
-        self.assertEqual(response.status_code, 302)
-
-        User = get_user_model()
-        test_user = User.objects.get(pk=self.user.pk)
-        self.assertFalse(test_user.check_password('Pass.123'))
-        self.assertTrue(test_user.check_password('newpass123'))