From da953c09bf0c8dca2225d730d17ffb615fa04979 Mon Sep 17 00:00:00 2001
From: Geert Kapteijns <ghkapteijns@gmail.com>
Date: Sat, 25 Feb 2017 19:06:33 +0100
Subject: [PATCH] Change UnVettedCommentaryFactory to UnvettedCommentaryFactory
---
SciPost_v1/settings.py | 1 +
commentaries/factories.py | 2 +-
commentaries/templates/commentaries/commentaries.html | 1 -
commentaries/test_forms.py | 4 ++--
commentaries/test_views.py | 4 ++--
theses/test_views.py | 1 -
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/SciPost_v1/settings.py b/SciPost_v1/settings.py
index e999aaf86..93080c61d 100644
--- a/SciPost_v1/settings.py
+++ b/SciPost_v1/settings.py
@@ -107,6 +107,7 @@ SHELL_PLUS_POST_IMPORTS = (
('theses.factories', ('ThesisLinkFactory')),
('comments.factories', ('CommentFactory')),
('submissions.factories', ('SubmissionFactory', 'EICassignedSubmissionFactory')),
+ ('commentaries.factories', ('EmptyCommentaryFactory', 'VettedCommentaryFactory', 'UnvettedCommentaryFactory')),
)
MATHJAX_ENABLED = True
diff --git a/commentaries/factories.py b/commentaries/factories.py
index 18e72a7b5..82319e0cd 100644
--- a/commentaries/factories.py
+++ b/commentaries/factories.py
@@ -34,5 +34,5 @@ class VettedCommentaryFactory(CommentaryFactory):
vetted = True
-class UnVettedCommentaryFactory(CommentaryFactory):
+class UnvettedCommentaryFactory(CommentaryFactory):
vetted = False
diff --git a/commentaries/templates/commentaries/commentaries.html b/commentaries/templates/commentaries/commentaries.html
index 8414ca91a..d555bd005 100644
--- a/commentaries/templates/commentaries/commentaries.html
+++ b/commentaries/templates/commentaries/commentaries.html
@@ -11,7 +11,6 @@
{% block content %}
-{# <section>#}
<div class="row">
<div class="col-md-4">
<div class="panel page-header-panel">
diff --git a/commentaries/test_forms.py b/commentaries/test_forms.py
index 8a81d2abb..cec31d307 100644
--- a/commentaries/test_forms.py
+++ b/commentaries/test_forms.py
@@ -3,7 +3,7 @@ from django.test import TestCase
from common.helpers import model_form_data
from scipost.factories import UserFactory
-from .factories import VettedCommentaryFactory, UnVettedCommentaryFactory
+from .factories import VettedCommentaryFactory, UnvettedCommentaryFactory
from .forms import RequestCommentaryForm, VetCommentaryForm
from .models import Commentary
@@ -12,7 +12,7 @@ class TestVetCommentaryForm(TestCase):
fixtures = ['permissions', 'groups']
def setUp(self):
- self.commentary = UnVettedCommentaryFactory.create()
+ self.commentary = UnvettedCommentaryFactory.create()
self.user = UserFactory()
self.form_data = {
'action_option': VetCommentaryForm.ACTION_ACCEPT,
diff --git a/commentaries/test_views.py b/commentaries/test_views.py
index d724770ab..606bbfc37 100644
--- a/commentaries/test_views.py
+++ b/commentaries/test_views.py
@@ -4,7 +4,7 @@ from django.test import TestCase
from scipost.factories import ContributorFactory
-from .factories import UnVettedCommentaryFactory, VettedCommentaryFactory
+from .factories import UnvettedCommentaryFactory, VettedCommentaryFactory
from .forms import CommentarySearchForm
from .models import Commentary
@@ -83,7 +83,7 @@ class VetCommentaryRequestsTest(TestCase):
self.assertEquals(response.context['commentary_to_vet'], None)
# Unvetted Commentaries do exist!
- UnVettedCommentaryFactory()
+ UnvettedCommentaryFactory()
response = self.client.get(self.view_url)
self.assertTrue(type(response.context['commentary_to_vet']) is Commentary)
diff --git a/theses/test_views.py b/theses/test_views.py
index 4cb20b101..8f6d5f202 100644
--- a/theses/test_views.py
+++ b/theses/test_views.py
@@ -31,7 +31,6 @@ class TestThesisDetail(TestCase):
self.assertEqual(response.status_code, 200)
-
class TestRequestThesisLink(TestCase):
fixtures = ['groups', 'permissions']
--
GitLab