From dafe6eda12fe625431a1a0189bf938da7f583b86 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Sun, 30 Jul 2017 09:25:00 +0200
Subject: [PATCH] Finalizing
---
commentaries/factories.py | 2 +-
commentaries/forms.py | 2 +-
commentaries/test_forms.py | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/commentaries/factories.py b/commentaries/factories.py
index d3a2226d7..978352975 100644
--- a/commentaries/factories.py
+++ b/commentaries/factories.py
@@ -63,4 +63,4 @@ class UnvettedCommentaryFactory(CommentaryFactory):
class UnvettedArxivPreprintCommentaryFactory(CommentaryFactory):
vetted = False
- pub_DOI = None
+ pub_DOI = ''
diff --git a/commentaries/forms.py b/commentaries/forms.py
index 5da14ecad..ce198737a 100644
--- a/commentaries/forms.py
+++ b/commentaries/forms.py
@@ -272,7 +272,7 @@ class VetCommentaryForm(forms.Form):
# Modified actions are not doing anything. Users are redirected to an edit page instead.
if self.commentary_is_accepted():
self.commentary.vetted = True
- self.commentary.vetted_by = Contributor.objects.get(user=self.user)
+ self.commentary.vetted_by = self.user.contributor
self.commentary.save()
return self.commentary
elif self.commentary_is_refused():
diff --git a/commentaries/test_forms.py b/commentaries/test_forms.py
index 64d6fda33..35e65abb6 100644
--- a/commentaries/test_forms.py
+++ b/commentaries/test_forms.py
@@ -101,14 +101,13 @@ class TestVetCommentaryForm(TestCase):
add_groups_and_permissions()
ContributorFactory.create_batch(5)
self.commentary = UnvettedCommentaryFactory.create()
- self.user = UserFactory()
+ self.user = UserFactory.create()
self.form_data = {
'action_option': VetCommentaryForm.ACTION_ACCEPT,
'refusal_reason': VetCommentaryForm.REFUSAL_EMPTY,
'email_response_field': 'Lorem Ipsum'
}
-
def test_valid_accepted_form(self):
"""Test valid form data and return Commentary"""
form = VetCommentaryForm(self.form_data, commentary_id=self.commentary.id, user=self.user)
@@ -127,7 +126,7 @@ class TestVetCommentaryForm(TestCase):
form = VetCommentaryForm(self.form_data, commentary_id=self.commentary.id, user=self.user)
self.assertTrue(form.is_valid())
self.assertFalse(Commentary.objects.vetted().exists())
- self.assertTrue(Commentary.objects.awaiting_vetting().exists())
+ self.assertTrue(Commentary.objects.awaiting_vetting().count() == 1)
# Delete the Commentary
form.process_commentary()
@@ -156,7 +155,7 @@ class TestVetCommentaryForm(TestCase):
def test_process_before_validation(self):
"""Test response of form on processing before validation"""
form = VetCommentaryForm(self.form_data, commentary_id=self.commentary.id, user=self.user)
- self.assertRaises(ValueError, form.process_commentary)
+ self.assertRaises(AttributeError, form.process_commentary)
class TestRequestPublishedArticleForm(TestCase):
--
GitLab