added tests for gender (select) and twitter (custom validate/clean logic) profile fields

misago/users/tests/test_bio_profilefield.py

@@ -8,9 +8,9 @@ from misago.admin.testutils import AdminTestCase
 UserModel = get_user_model()
 
 
-class AdminTests(AdminTestCase):
+class BioProfileFieldTests(AdminTestCase):
     def setUp(self):
-        super(AdminTests, self).setUp()
+        super(BioProfileFieldTests, self).setUp()
 
         self.test_link = reverse(
             'misago:admin:users:accounts:edit',

misago/users/tests/test_gender_profilefield.py

@@ -0,0 +1,259 @@
+from django.contrib.auth import get_user_model
+from django.urls import reverse
+from django.utils import six
+
+from misago.admin.testutils import AdminTestCase
+
+
+UserModel = get_user_model()
+
+
+class GenderProfileFieldTests(AdminTestCase):
+    def setUp(self):
+        super(GenderProfileFieldTests, self).setUp()
+
+        self.test_link = reverse(
+            'misago:admin:users:accounts:edit',
+            kwargs={
+                'pk': self.user.pk,
+            },
+        )
+
+    def test_field_displays_in_admin(self):
+        """field displays in admin"""
+        response = self.client.get(self.test_link)
+        self.assertContains(response, 'name="gender"')
+
+    def test_admin_clears_field(self):
+        """admin form allows admins to clear field"""
+        self.user.profile_fields['gender'] = 'female'
+        self.user.save()
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['gender'], 'female')
+
+        response = self.client.post(
+            self.test_link,
+            data={
+                'username': 'Edited',
+                'rank': six.text_type(self.user.rank_id),
+                'roles': six.text_type(self.user.roles.all()[0].pk),
+                'email': 'reg@stered.com',
+                'new_password': '',
+                'signature': '',
+                'is_signature_locked': '0',
+                'is_hiding_presence': '0',
+                'limits_private_thread_invites_to': '0',
+                'signature_lock_staff_message': '',
+                'signature_lock_user_message': '',
+                'subscribe_to_started_threads': '2',
+                'subscribe_to_replied_threads': '2',
+            }
+        )
+        self.assertEqual(response.status_code, 302)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['gender'], '')
+
+    def test_admin_validates_field(self):
+        """admin form allows admins to edit field"""
+        response = self.client.post(
+            self.test_link,
+            data={
+                'username': 'Edited',
+                'rank': six.text_type(self.user.rank_id),
+                'roles': six.text_type(self.user.roles.all()[0].pk),
+                'email': 'reg@stered.com',
+                'gender': 'attackcopter',
+                'new_password': '',
+                'signature': '',
+                'is_signature_locked': '0',
+                'is_hiding_presence': '0',
+                'limits_private_thread_invites_to': '0',
+                'signature_lock_staff_message': '',
+                'signature_lock_user_message': '',
+                'subscribe_to_started_threads': '2',
+                'subscribe_to_replied_threads': '2',
+            }
+        )
+
+        self.assertContains(response, 'attackcopter is not one of the available choices.')
+
+    def test_admin_edits_field(self):
+        """admin form allows admins to edit field"""
+        response = self.client.post(
+            self.test_link,
+            data={
+                'username': 'Edited',
+                'rank': six.text_type(self.user.rank_id),
+                'roles': six.text_type(self.user.roles.all()[0].pk),
+                'email': 'reg@stered.com',
+                'gender': 'female',
+                'new_password': '',
+                'signature': '',
+                'is_signature_locked': '0',
+                'is_hiding_presence': '0',
+                'limits_private_thread_invites_to': '0',
+                'signature_lock_staff_message': '',
+                'signature_lock_user_message': '',
+                'subscribe_to_started_threads': '2',
+                'subscribe_to_replied_threads': '2',
+            }
+        )
+        self.assertEqual(response.status_code, 302)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['gender'], 'female')
+
+    def test_admin_search_field(self):
+        """admin users search searches this field"""
+        test_link = reverse('misago:admin:users:accounts:index')
+
+        response = self.client.get('{}?redirected=1&profilefields=female'.format(test_link))
+        self.assertContains(response, "No users matching search criteria have been found.")
+
+        self.user.profile_fields['gender'] = 'female'
+        self.user.save()
+
+        response = self.client.get('{}?redirected=1&profilefields=female'.format(test_link))
+        self.assertNotContains(response, "No users matching search criteria have been found.")
+
+    def test_field_display(self):
+        """field displays on user profile when filled in"""
+        test_link = reverse(
+            'misago:user-details',
+            kwargs={
+                'pk': self.user.pk,
+                'slug': self.user.slug,
+            },
+        )
+
+        response = self.client.get(test_link)
+        self.assertNotContains(response, 'Gender')
+
+        self.user.profile_fields['gender'] = 'secret'
+        self.user.save()
+
+        response = self.client.get(test_link)
+        self.assertContains(response, 'Gender')
+        self.assertContains(response, 'Not telling')
+
+    def test_field_outdated_hidden(self):
+        """field with outdated value is hidden"""
+        test_link = reverse(
+            'misago:user-details',
+            kwargs={
+                'pk': self.user.pk,
+                'slug': self.user.slug,
+            },
+        )
+
+        response = self.client.get(test_link)
+        self.assertNotContains(response, 'Gender')
+
+        self.user.profile_fields['gender'] = 'not valid'
+        self.user.save()
+
+        response = self.client.get(test_link)
+        self.assertNotContains(response, 'Gender')
+
+    def test_field_display_json(self):
+        """field is included in display json"""
+        test_link = reverse('misago:api:user-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.get(test_link)
+        self.assertEqual(response.json()['groups'], [])
+
+        self.user.profile_fields['gender'] = 'male'
+        self.user.save()
+
+        response = self.client.get(test_link)
+        self.assertEqual(
+            response.json()['groups'],
+            [
+                {
+                    'name': 'Personal',
+                    'fields': [
+                        {
+                            'fieldname': 'gender',
+                            'name': 'Gender',
+                            'text': 'Male',
+                        }
+                    ],
+                },
+            ]
+        )
+
+    def test_field_outdated_hidden_json(self):
+        """field with outdated value is removed in display json"""
+        test_link = reverse('misago:api:user-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.get(test_link)
+        self.assertEqual(response.json()['groups'], [])
+
+        self.user.profile_fields['gender'] = 'invalid'
+        self.user.save()
+
+        response = self.client.get(test_link)
+        self.assertEqual(response.json()['groups'], [])
+
+    def test_api_returns_field_json(self):
+        """field json is returned from API"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.get(test_link)
+
+        found_field = None
+        for group in response.json():
+            for field in group['fields']:
+                if field['fieldname'] == 'gender':
+                    found_field = field
+
+        self.assertEqual(found_field, {
+            'fieldname': 'gender',
+            'label': 'Gender',
+            'help_text': None,
+            'input': {
+                'type': 'select',
+                'choices': [
+                    {'label': 'Not specified', 'value': ''},
+                    {'label': 'Not telling', 'value': 'secret'},
+                    {'label': 'Female', 'value': 'female'},
+                    {'label': 'Male', 'value': 'male'},
+                ],
+            },
+            'initial': '',
+        })
+
+    def test_api_clears_field(self):
+        """field can be cleared via api"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        self.user.profile_fields['gender'] = 'secret'
+        self.user.save()
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['gender'], 'secret')
+
+        response = self.client.post(test_link, data={})
+        self.assertEqual(response.status_code, 200)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['gender'], '')
+
+    def test_api_validates_field(self):
+        """field can be edited via api"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.post(test_link, data={'gender': 'attackhelicopter'})
+        self.assertContains(response, "attackhelicopter is not one of the available choices.", status_code=400)
+
+    def test_api_edits_field(self):
+        """field can be edited via api"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.post(test_link, data={'gender': 'female'})
+        self.assertEqual(response.status_code, 200)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['gender'], 'female')

misago/users/tests/test_twitter_profilefield.py

@@ -0,0 +1,221 @@
+from django.contrib.auth import get_user_model
+from django.urls import reverse
+from django.utils import six
+
+from misago.admin.testutils import AdminTestCase
+
+
+UserModel = get_user_model()
+
+
+class TwitterProfileFieldTests(AdminTestCase):
+    def setUp(self):
+        super(TwitterProfileFieldTests, self).setUp()
+
+        self.test_link = reverse(
+            'misago:admin:users:accounts:edit',
+            kwargs={
+                'pk': self.user.pk,
+            },
+        )
+
+    def test_field_displays_in_admin(self):
+        """field displays in admin"""
+        response = self.client.get(self.test_link)
+        self.assertContains(response, 'name="twitter"')
+
+    def test_admin_clears_field(self):
+        """admin form allows admins to clear field"""
+        self.user.profile_fields['twitter'] = 'lorem_ipsum'
+        self.user.save()
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['twitter'], 'lorem_ipsum')
+
+        response = self.client.post(
+            self.test_link,
+            data={
+                'username': 'Edited',
+                'rank': six.text_type(self.user.rank_id),
+                'roles': six.text_type(self.user.roles.all()[0].pk),
+                'email': 'reg@stered.com',
+                'new_password': '',
+                'signature': '',
+                'is_signature_locked': '0',
+                'is_hiding_presence': '0',
+                'limits_private_thread_invites_to': '0',
+                'signature_lock_staff_message': '',
+                'signature_lock_user_message': '',
+                'subscribe_to_started_threads': '2',
+                'subscribe_to_replied_threads': '2',
+            }
+        )
+        self.assertEqual(response.status_code, 302)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['twitter'], '')
+
+    def test_admin_validates_field(self):
+        """admin form allows admins to edit field"""
+        response = self.client.post(
+            self.test_link,
+            data={
+                'username': 'Edited',
+                'rank': six.text_type(self.user.rank_id),
+                'roles': six.text_type(self.user.roles.all()[0].pk),
+                'email': 'reg@stered.com',
+                'twitter': 'lorem!ipsum',
+                'new_password': '',
+                'signature': '',
+                'is_signature_locked': '0',
+                'is_hiding_presence': '0',
+                'limits_private_thread_invites_to': '0',
+                'signature_lock_staff_message': '',
+                'signature_lock_user_message': '',
+                'subscribe_to_started_threads': '2',
+                'subscribe_to_replied_threads': '2',
+            }
+        )
+
+        self.assertContains(response, "This is not a valid twitter handle.")
+
+    def test_admin_edits_field(self):
+        """admin form allows admins to edit field"""
+        response = self.client.post(
+            self.test_link,
+            data={
+                'username': 'Edited',
+                'rank': six.text_type(self.user.rank_id),
+                'roles': six.text_type(self.user.roles.all()[0].pk),
+                'email': 'reg@stered.com',
+                'twitter': 'lorem_ipsum',
+                'new_password': '',
+                'signature': '',
+                'is_signature_locked': '0',
+                'is_hiding_presence': '0',
+                'limits_private_thread_invites_to': '0',
+                'signature_lock_staff_message': '',
+                'signature_lock_user_message': '',
+                'subscribe_to_started_threads': '2',
+                'subscribe_to_replied_threads': '2',
+            }
+        )
+        self.assertEqual(response.status_code, 302)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['twitter'], 'lorem_ipsum')
+
+    def test_admin_search_field(self):
+        """admin users search searches this field"""
+        test_link = reverse('misago:admin:users:accounts:index')
+
+        response = self.client.get('{}?redirected=1&profilefields=ipsum'.format(test_link))
+        self.assertContains(response, "No users matching search criteria have been found.")
+
+        self.user.profile_fields['twitter'] = 'lorem_ipsum'
+        self.user.save()
+
+        response = self.client.get('{}?redirected=1&profilefields=ipsum'.format(test_link))
+        self.assertNotContains(response, "No users matching search criteria have been found.")
+
+    def test_field_display(self):
+        """field displays on user profile when filled in"""
+        test_link = reverse(
+            'misago:user-details',
+            kwargs={
+                'pk': self.user.pk,
+                'slug': self.user.slug,
+            },
+        )
+
+        response = self.client.get(test_link)
+        self.assertNotContains(response, 'Twitter')
+
+        self.user.profile_fields['twitter'] = 'lorem_ipsum'
+        self.user.save()
+
+        response = self.client.get(test_link)
+        self.assertContains(response, 'Twitter')
+        self.assertContains(response, 'href="https://twitter.com/lorem_ipsum"')
+        self.assertContains(response, '@lorem_ipsum')
+
+    def test_field_display_json(self):
+        """field is included in display json"""
+        test_link = reverse('misago:api:user-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.get(test_link)
+        self.assertEqual(response.json()['groups'], [])
+
+        self.user.profile_fields['twitter'] = 'lorem_ipsum'
+        self.user.save()
+
+        response = self.client.get(test_link)
+        self.assertEqual(
+            response.json()['groups'],
+            [
+                {
+                    'name': 'Contact',
+                    'fields': [
+                        {
+                            'fieldname': 'twitter',
+                            'name': 'Twitter handle',
+                            'text': '@lorem_ipsum',
+                            'url': 'https://twitter.com/lorem_ipsum',
+                        }
+                    ],
+                },
+            ]
+        )
+
+    def test_api_returns_field_json(self):
+        """field json is returned from API"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.get(test_link)
+
+        found_field = None
+        for group in response.json():
+            for field in group['fields']:
+                if field['fieldname'] == 'twitter':
+                    found_field = field
+
+        self.assertEqual(found_field, {
+            'fieldname': 'twitter',
+            'label': 'Twitter handle',
+            'help_text': 'Without leading "@" sign.',
+            'input': {'type': 'text'},
+            'initial': '',
+        })
+
+    def test_api_clears_field(self):
+        """field can be cleared via api"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        self.user.profile_fields['twitter'] = 'lorem_ipsum'
+        self.user.save()
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['twitter'], 'lorem_ipsum')
+
+        response = self.client.post(test_link, data={})
+        self.assertEqual(response.status_code, 200)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['twitter'], '')
+
+    def test_api_validates_field(self):
+        """field can be edited via api"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.post(test_link, data={'twitter': '@lorem!ipsum'})
+        self.assertContains(response, "This is not a valid twitter handle.", status_code=400)
+
+    def test_api_edits_field(self):
+        """field can be edited via api"""
+        test_link = reverse('misago:api:user-edit-details', kwargs={'pk': self.user.pk})
+
+        response = self.client.post(test_link, data={'twitter': '@lorem_ipsum'})
+        self.assertEqual(response.status_code, 200)
+
+        self.reload_user()
+        self.assertEqual(self.user.profile_fields['twitter'], 'lorem_ipsum')