Fixed validation of image without text. This refs #13

boards/forms.py

@@ -33,8 +33,6 b' class PostForm(forms.Form):'
         return title
 
     def clean_text(self):
-        self._clean_text_image()
-
         text = self.cleaned_data['text']
         if text:
             if len(text) > self.MAX_TEXT_LENGTH:
@@ -44,8 +42,6 b' class PostForm(forms.Form):'
         return text
 
     def clean_image(self):
-        self._clean_text_image()
-
         image = self.cleaned_data['image']
         if image:
             if image._size > self.MAX_IMAGE_SIZE:
@@ -57,6 +53,8 b' class PostForm(forms.Form):'
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
+        self._clean_text_image()
+
         return cleaned_data
 
     def _clean_text_image(self):
@@ -64,7 +62,9 b' class PostForm(forms.Form):'
         image = self.cleaned_data.get('image')
 
         if (not text) and (not image):
-            raise forms.ValidationError('Either text or image must be entered.')
+            error_message = 'Either text or image must be entered.'
+            self._errors['text'] = self.error_class([error_message])
+            self._errors['image'] = self.error_class([error_message])
 
 
 class ThreadForm(PostForm):

boards/tests.py

@@ -10,6 +10,7 b' from neboard import settings'
 TEST_TEXT = 'test text'
 
 NEW_THREAD_PAGE = '/'
+THREAD_PAGE = '/thread/1/'
 HTTP_CODE_REDIRECT = 302
 
 
@@ -159,4 +160,13 b' class BoardTests(TestCase):'
         client.post(NEW_THREAD_PAGE, {'text': TEST_TEXT,
                                       'tags': invalid_tags})
         self.assertEqual(1, Post.objects.count(), msg='The validation passed '
-                                                      'where it should fail')
  No newline at end of file
+                                                      'where it should fail')
+
+        response = client.post(THREAD_PAGE, {'text': TEST_TEXT,
+                                             'tags': valid_tags})
+        self.assertEqual(response.status_code, HTTP_CODE_REDIRECT,
+                         msg='Posting new message failed: got code ' +
+                             str(response.status_code))
+
+        self.assertEqual(2, Post.objects.count(),
+                         msg='No posts were created')
  No newline at end of file