comment.forms ST_COMMENT_MAX_LEN nitely#107

spirit/comment/forms.py

@@ -17,6 +17,9 @@
 
 class CommentForm(forms.ModelForm):
 
+    comment = forms.CharField(
+        max_length=settings.ST_COMMENT_MAX_LEN, widget=forms.Textarea)
+
     class Meta:
         model = Comment
         fields = ['comment', ]

spirit/comment/migrations/0004_auto_20160315_2021.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('spirit_comment', '0003_auto_20151115_0400'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='comment',
+            name='comment',
+            field=models.TextField(verbose_name='comment'),
+        ),
+    ]

spirit/comment/models.py

@@ -12,8 +12,6 @@
 from .managers import CommentQuerySet
 
 
-COMMENT_MAX_LEN = 3000  # changing this needs migration
-
 COMMENT, MOVED, CLOSED, UNCLOSED, PINNED, UNPINNED = range(6)
 
 ACTION = (
@@ -31,7 +29,7 @@ class Comment(models.Model):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='st_comments')
     topic = models.ForeignKey('spirit_topic.Topic')
 
-    comment = models.TextField(_("comment"), max_length=COMMENT_MAX_LEN)
+    comment = models.TextField(_("comment"))
     comment_html = models.TextField(_("comment html"))
     action = models.IntegerField(_("action"), choices=ACTION, default=COMMENT)
     date = models.DateTimeField(default=timezone.now)

spirit/comment/tests.py

@@ -579,6 +579,24 @@ def test_comment_image_upload_invalid(self):
         form = CommentImageForm(data={}, files=files)
         self.assertFalse(form.is_valid())
 
+    def test_comment_max_len(self):
+        """
+        Restrict comment len
+        """
+        comment = 'a' * settings.ST_COMMENT_MAX_LEN
+        form_data = {'comment': comment, }
+        form = CommentForm(data=form_data)
+        self.assertEqual(form.is_valid(), True)
+
+    def test_comment_max_len_invalid(self):
+        """
+        Restrict comment len
+        """
+        comment = 'a' * (settings.ST_COMMENT_MAX_LEN + 1)
+        form_data = {'comment': comment, }
+        form = CommentForm(data=form_data)
+        self.assertEqual(form.is_valid(), False)
+
 
 class CommentUtilsTest(TestCase):
 

spirit/settings.py

@@ -14,6 +14,7 @@
 
 ST_NOTIFICATIONS_PER_PAGE = 20
 
+ST_COMMENT_MAX_LEN = 3000
 ST_MENTIONS_PER_COMMENT = 30
 
 ST_YT_PAGINATOR_PAGE_RANGE = 3