apps/newsletters: add clean to test if project is given - fixes #1737

apps/newsletters/forms.py

@@ -38,3 +38,9 @@ def __init__(self, user=None, organisation=None, *args, **kwargs):
             label=_('Organisation'),
             queryset=Organisation.objects,
             required=False, empty_label=None)
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if int(cleaned_data.get('receivers')) == models.PROJECT and \
+                not cleaned_data.get('project'):
+            self.add_error('project', _('Select a Project'))

tests/newsletters/test_newsletter_views.py

@@ -52,45 +52,45 @@ def test_send_project(admin, client, project, user_factory, follow_factory,
     assert mail.outbox[0].subject == 'Testsubject'
 
 
-# @pytest.mark.django_db
-# def test_send_project_no_project(admin, client, project, user_factory,
-#                                  follow_factory, email_address_factory):
-#     organisation = project.organisation
-
-#     user1 = user_factory(get_newsletters=True)
-#     user2 = user_factory()
-#     email_address_factory(user=user1, email=user1.email,
-#                           primary=True, verified=True)
-#     email_address_factory(user=user2, email=user2.email,
-#                           primary=True, verified=True)
-
-#     user_factory()
-
-#     follow_models.Follow.objects.all().delete()
-#     follow_factory(creator=user1, project=project)
-#     follow_factory(creator=user2, project=project, enabled=False)
-
-#     data = {
-#         'sender_name': 'Tester',
-#         'sender': 'test@test.de',
-#         'subject': 'Testsubject',
-#         'body': 'Testbody',
-#         'receivers': newsletter_models.PROJECT,
-#         'organisation': organisation.pk,
-#         'project': '',
-#         'send': 'Send',
-#     }
-
-#     url = reverse('a4dashboard:newsletter-create',
-#                   kwargs={'organisation_slug': organisation.slug})
-#     client.login(username=admin.email, password='password')
-#     response = client.post(url, data)
-#     # form submit failed, still on same form page, no redirect
-#     assert response.status_code == 200
-#     assert response.template_name[0] == \
-#         'a4_candy_newsletters/newsletter_dashboard_form.html'
-#     assert not response.context['form'].is_valid()
-#     assert newsletter_models.Newsletter.objects.count() == 0
+@pytest.mark.django_db
+def test_send_project_no_project(admin, client, project, user_factory,
+                                 follow_factory, email_address_factory):
+    organisation = project.organisation
+
+    user1 = user_factory(get_newsletters=True)
+    user2 = user_factory()
+    email_address_factory(user=user1, email=user1.email,
+                          primary=True, verified=True)
+    email_address_factory(user=user2, email=user2.email,
+                          primary=True, verified=True)
+
+    user_factory()
+
+    follow_models.Follow.objects.all().delete()
+    follow_factory(creator=user1, project=project)
+    follow_factory(creator=user2, project=project, enabled=False)
+
+    data = {
+        'sender_name': 'Tester',
+        'sender': 'test@test.de',
+        'subject': 'Testsubject',
+        'body': 'Testbody',
+        'receivers': newsletter_models.PROJECT,
+        'organisation': organisation.pk,
+        'project': '',
+        'send': 'Send',
+    }
+
+    url = reverse('a4dashboard:newsletter-create',
+                  kwargs={'organisation_slug': organisation.slug})
+    client.login(username=admin.email, password='password')
+    response = client.post(url, data)
+    # form submit failed, still on same form page, no redirect
+    assert response.status_code == 200
+    assert response.template_name[0] == \
+        'a4_candy_newsletters/restricted_newsletter_dashboard_form.html'
+    assert not response.context['form'].is_valid()
+    assert newsletter_models.Newsletter.objects.count() == 0
 
 
 @pytest.mark.django_db