Improve test coverage of users and events apps

Also, tweak coverage.py settings to produce better
coverage reports.

Author: berkerpeksag

Diff for: .coveragerc

@@ -1,4 +1,24 @@
 [run]
 branch = True
 source = .
-omit = manage.py,*/migrations/*,*/tests/*,*/tests.py,pydotorg/wsgi.py,*venv*,pydotorg/settings/*,pydotorg/compilers.py,*/factories.py
+omit =
+    *venv*
+    manage.py
+    pydotorg/wsgi.py
+    pydotorg/settings/*
+    pydotorg/compilers.py
+    */migrations/*
+    */tests/*
+    */tests.py
+    */actions.py
+    */admin.py
+    */factories.py
+    */search_indexes.py
+
+[report]
+exclude_lines =
+    def get_absolute_url
+    def __repr__
+    def __str__
+    if settings.DEBUG
+    if __name__ == .__main__.:

Diff for: .travis.yml

@@ -14,7 +14,7 @@ before_script:
   - psql -c 'create database "python.org";' -U postgres
 script:
   - python -Wd -m coverage run manage.py test -v2
-  - coverage report --fail-under=75
+  - coverage report -m --fail-under=75
 notifications:
   irc:
     channels:

Diff for: events/tests/test_views.py

@@ -33,6 +33,12 @@ def setUpTestData(cls):
             finish=cls.now - datetime.timedelta(days=1),
         )
 
+    def test_events_homepage(self):
+        url = reverse('events:events')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.context['object_list']), 1)
+
     def test_calendar_list(self):
         calendars_count = Calendar.objects.count()
         url = reverse('events:calendar_list')
@@ -143,6 +149,7 @@ def test_event_detail(self):
 
     def test_upcoming_tag(self):
         self.assertEqual(len(get_events_upcoming()), 1)
+        self.assertEqual(len(get_events_upcoming(only_featured=True)), 1)
         self.rule.begin = self.now - datetime.timedelta(days=3)
         self.rule.finish = self.now - datetime.timedelta(days=2)
         self.rule.save()

Diff for: membership/models.py

@@ -1,3 +1 @@
-from django.db import models
-
 # Create your models here.

Diff for: users/tests/test_forms.py

@@ -3,7 +3,7 @@
 
 from allauth.account.forms import SignupForm
 
-from users.forms import UserProfileForm
+from users.forms import UserProfileForm, MembershipForm
 
 User = get_user_model()
 
@@ -100,6 +100,23 @@ def test_non_ascii_username(self):
             ]
         )
 
+    def test_user_membership(self):
+        form = MembershipForm({
+            'legal_name': 'Some Name',
+            'preferred_name': 'Sommy',
+            'email_address': '[email protected]',
+            'city': 'Lawrence',
+            'region': 'Kansas',
+            'country': 'USA',
+            'postal_code': '66044',
+            'psf_announcements': True,
+        })
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors['psf_code_of_conduct'],
+            ['Agreeing to the code of conduct is required.']
+        )
+
 
 class UserProfileFormTestCase(TestCase):
 

Diff for: users/tests/test_templatetags.py

@@ -24,6 +24,10 @@ def test_parse_location(self):
         rendered = self.render_string(template, {'user': user})
         self.assertEqual(rendered, "Lawrence, KS")
 
+        user = UserFactory(membership__region='KS', membership__country='USA')
+        rendered = self.render_string(template, {'user': user})
+        self.assertEqual(rendered, 'KS USA')
+
         user = UserFactory(
             membership__city='Lawrence',
             membership__region='KS',

Diff for: users/tests/test_views.py

@@ -21,8 +21,8 @@ def setUp(self):
         self.user2 = UserFactory(
             username='spameggs',
             password='password',
-            search_visibility=0,
-            email_privacy=1,
+            search_visibility=User.SEARCH_PRIVATE,
+            email_privacy=User.EMAIL_PRIVATE,
             public_profile=False,
         )
 
@@ -95,6 +95,22 @@ def test_membership_update(self):
         response = self.client.post(url, post_data)
         self.assertEqual(response.status_code, 302)
 
+    def test_membership_update_404(self):
+        url = reverse('users:user_membership_edit')
+        self.assertFalse(self.user.has_membership)
+        self.client.login(username=self.user, password='password')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 404)
+
+    def test_user_has_already_have_membership(self):
+        # Should redirect to /membership/edit/ if user already
+        # has membership.
+        url = reverse('users:user_membership_create')
+        self.assertTrue(self.user2.has_membership)
+        self.client.login(username=self.user2, password='password')
+        response = self.client.get(url)
+        self.assertRedirects(response, reverse('users:user_membership_edit'))
+
     def test_user_update(self):
         self.client.login(username='username', password='password')
         url = reverse('users:user_profile_edit')
@@ -267,3 +283,9 @@ def test_is_active_login(self):
             response,
             '{}?next={}'.format(reverse('account_login'), url)
         )
+
+    def test_user_list(self):
+        url = reverse('users:user_list')
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.context['user_list']), 1)

Diff for: users/views.py

@@ -35,15 +35,12 @@ def dispatch(self, *args, **kwargs):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        if self.request.user.email:
-            kwargs['initial'] = {'email_address': self.request.user.email}
-
+        kwargs['initial'] = {'email_address': self.request.user.email}
         return kwargs
 
     def form_valid(self, form):
         self.object = form.save(commit=False)
-        if self.request.user.is_authenticated:
-            self.object.creator = self.request.user
+        self.object.creator = self.request.user
         self.object.save()
 
         # Send subscription email to mailing lists
@@ -77,8 +74,7 @@ def get_object(self):
 
     def form_valid(self, form):
         self.object = form.save(commit=False)
-        if self.request.user.is_authenticated:
-            self.object.creator = self.request.user
+        self.object.creator = self.request.user
         self.object.save()
         return super().form_valid(form)
 

Diff for: work_groups/views.py

@@ -1,3 +1 @@
-from django.shortcuts import render
-
 # Create your views here.