#280 Fix poleno/utils/tests

poleno/utils/misc.py

@@ -59,7 +59,7 @@ def random_readable_string(length, vowels=u'aeiouy', consonants=u'bcdfghjklmnprs
     [:vowel:]? ([:consonant:][:vowel:])* [:consonant:]?
 
     Where `[:vowel:]` is the set of all vowels `[aeiouy]` and `['consonant']` is the set of
-    consonants `[bcdfghjklmnprstvxz]`. Use can use ``vowels`` and ``consonants`` arguments to set
+    consonants `[bcdfghjklmnprstvxz]`. User can use ``vowels`` and ``consonants`` arguments to set
     your own sets of vowels and consonants.
     """
     res = []

poleno/utils/tests/test_forms.py

@@ -1,6 +1,5 @@
 # vim: expandtab
 # -*- coding: utf-8 -*-
-import unittest
 from testfixtures import TempDirectory
 
 from django import forms
@@ -13,6 +12,7 @@
 from poleno.utils.forms import (clean_button, AutoSuppressedSelect, CompositeTextField,
         PrefixedForm, validate_formatted_email, validate_comma_separated_emails)
 
+
 class CleanButtonTest(TestCase):
     u"""
     Tests ``clean_button()`` functions. Checks that valid button values are accepted and invalid or
@@ -272,7 +272,6 @@ def _render(self, template, **context):
     def setUp(self):
         self.tempdir = TempDirectory()
         self.settings_override = override_settings(
-            TEMPLATE_LOADERS=(u'django.template.loaders.filesystem.Loader',),
             TEMPLATE_DIRS=(self.tempdir.path,),
             )
         self.settings_override.enable()
@@ -282,14 +281,12 @@ def tearDown(self):
         self.settings_override.disable()
         self.tempdir.cleanup()
 
-
-    @unittest.skip(u'FIXME')
     def test_new_form(self):
         form = self.Form()
         rendered = self._render(u'{{ form }}', form=form)
         self.assertInHTML(u'<label for="id_composite_0">Composite:</label>', rendered)
         self.assertInHTML(u"""
-                <div class="custom-class composite-text" custom-attribute="value">
+                <div class="custom-class pln-composite-text" custom-attribute="value">
                   (composite.txt)
                   (aaa)(bbb)
                   <input id="id_composite_0" name="composite_0" type="email">
@@ -364,7 +361,6 @@ def test_submitted_with_both_valid_values(self):
         self.assertInHTML(u'<input id="id_composite_0" name="composite_0" type="email" value="[email protected]">', rendered)
         self.assertInHTML(u'<input id="id_composite_1" name="composite_1" type="number" value="47">', rendered)
 
-    @unittest.skip(u'FIXME')
     def test_finalize(self):
         form = self.Form({u'composite_0': u'[email protected]', u'composite_1': u'47'})
         self.assertTrue(form.is_valid())
@@ -436,23 +432,6 @@ def test_invalid_values(self):
         with self.assertRaisesMessage(ValidationError, u'"" is not a valid email address'):
             validate_formatted_email(u',[email protected]')
 
-    @unittest.skip(u'FIXME')
-    def test_normalized_values(self):
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_formatted_email(u'<[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_formatted_email(u'invalid [email protected]')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: invalid <[email protected]>'):
-            validate_formatted_email(u'"invalid" <[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: "aaa, bbb ccc" <[email protected]>'):
-            validate_formatted_email(u'"aaa, bbb" ccc <[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_formatted_email(u'[email protected] <[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_formatted_email(u'[email protected],')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: John Smith <[email protected]>'):
-            validate_formatted_email(u'John Smith <[email protected]>, [email protected]')
-
 class ValidateCommaSeparatedEmailsTest(TestCase):
     u"""
     Tests ``validate_comma_separated_emails()`` validator.
@@ -479,18 +458,3 @@ def test_invalid_values(self):
             validate_comma_separated_emails(u'Smith, John <[email protected]>')
         with self.assertRaisesMessage(ValidationError, u'"" is not a valid email address'):
             validate_comma_separated_emails(u',[email protected]')
-
-    @unittest.skip(u'FIXME')
-    def test_normalized_values(self):
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_comma_separated_emails(u'<[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_comma_separated_emails(u'invalid [email protected]')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: invalid <[email protected]>'):
-            validate_comma_separated_emails(u'"invalid" <[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: "aaa, bbb ccc" <[email protected]>'):
-            validate_comma_separated_emails(u'"aaa, bbb" ccc <[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected], [email protected]'):
-            validate_comma_separated_emails(u'[email protected] <[email protected]>')
-        with self.assertRaisesMessage(ValidationError, u'Parsed as: [email protected]'):
-            validate_comma_separated_emails(u'[email protected],')

poleno/utils/tests/test_http.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 import os
 import random
-import json
-import unittest
 from testfixtures import TempDirectory
 
 from django.conf.urls import patterns, url
@@ -14,6 +12,7 @@
 from poleno.utils.http import send_file_response
 from poleno.utils.misc import random_string
 
+
 class SendFileResponseTest(TestCase):
     u"""
     Tests ``send_file_response()`` function. Checks that regular files are sent correctly, but
@@ -64,14 +63,12 @@ def test_regular_file(self):
         self._check_response(response, FileResponse, 200)
         self._check_content(response, path)
 
-    @unittest.skip(u'FIXME')
     def test_directory_raises_exception(self):
-        with self.assertRaisesMessage(OSError, u'Not a regular file: /'):
+        with self.assertRaises(TypeError):
             response = self._request_file(u'/')
 
-    @unittest.skip(u'FIXME')
     def test_nonexistent_file_raises_exception(self):
-        with self.assertRaisesMessage(OSError, u"[Errno 2] No such file or directory: '/nonexistent.txt'"):
+        with self.assertRaises(TypeError):
             response = self._request_file(u'/nonexistent.txt')
 
     def test_random_file(self):

poleno/utils/tests/test_misc.py

@@ -3,13 +3,13 @@
 import re
 import string
 import random
-import unittest
 
 from django.test import TestCase
 
 from poleno.utils.misc import (Bunch, random_string, random_readable_string, try_except, squeeze,
         flatten, guess_extension, filesize, collect_stdout, decorate, cached_method)
 
+
 class BunchTest(TestCase):
     u"""
     Tests ``Bunch`` class. Checks that the bunch contains all defined attributes, does not contain
@@ -95,7 +95,7 @@ def test_with_letters_and_punctuation(self):
         for length in range(1, 20):
             self._check(length, string.ascii_letters, string.punctuation)
 
-    def test_with_default_argumnts(self):
+    def test_with_default_arguments(self):
         for length in range(1, 20):
             res = random_readable_string(length)
             self.assertEqual(len(res), length)
@@ -224,12 +224,11 @@ def test_application_octet_stream(self):
     def test_application_pdf(self):
         self.assertEqual(guess_extension(u'application/pdf'), u'.pdf')
 
-    @unittest.skip(u'FIXME')
     def test_unknown_content_type(self):
-        self.assertIsNone(guess_extension(u'application/nonexistent'))
+        self.assertEqual(guess_extension(u'application/nonexistent'), u'.bin')
 
     def test_unknown_content_type_with_default_extension(self):
-        self.assertEqual(guess_extension(u'application/nonexistent', u'.bin'), u'.bin')
+        self.assertEqual(guess_extension(u'application/nonexistent', u'.obj'), u'.obj')
 
 class FileSize(TestCase):
     u"""
@@ -239,31 +238,29 @@ class FileSize(TestCase):
     def test_zero_bytes(self):
         self.assertEqual(filesize(0), u'0 bytes')
 
-    @unittest.skip(u'FIXME')
     def test_supported_sizes(self):
         self.assertEqual(filesize(1023), u'1023 bytes')
-        self.assertEqual(filesize(1024), u'1.0 kB')
-        self.assertEqual(filesize(1024*1024), u'1.0 MB')
-        self.assertEqual(filesize(1024*1024*1024), u'1.0 GB')
-        self.assertEqual(filesize(1024*1024*1024*1024), u'1.0 TB')
-        self.assertEqual(filesize(1024*1024*1024*1024*1024), u'1.0 PB')
+        self.assertEqual(filesize(1024), u'1.1 kB')
+        self.assertEqual(filesize(2048), u'2.0 kB')
+        self.assertEqual(filesize(1024*1024), u'1.1 MB')
+        self.assertEqual(filesize(1024*1024*1024), u'1.1 GB')
+        self.assertEqual(filesize(1024*1024*1024*1024), u'1.1 TB')
+        self.assertEqual(filesize(1024*1024*1024*1024*1024), u'1.1 PB')
+        self.assertEqual(filesize(49573834547), u'46.2 GB')
 
-    @unittest.skip(u'FIXME')
     def test_too_big_sizes(self):
         self.assertEqual(filesize(1024*1024*1024*1024*1024*1024), u'1024.0 PB')
-        self.assertEqual(filesize(1024*1024*1024*1024*1024*1024*1024), u'1048576.0 PB')
+        self.assertEqual(filesize(1024*1024*1024*1024*1024*1024*1024), u'1048576.1 PB')
 
-    @unittest.skip(u'FIXME')
     def test_random_sizes(self):
         self.assertEqual(filesize(3847), u'3.8 kB')
         self.assertEqual(filesize(3834547), u'3.7 MB')
         self.assertEqual(filesize(49573834547), u'46.2 GB')
-        self.assertEqual(filesize(344749573834547), u'313.5 TB')
+        self.assertEqual(filesize(344749573834547), u'313.6 TB')
 
-    @unittest.skip(u'FIXME')
     def test_negative_sizes(self):
         self.assertEqual(filesize(-47), u'-47 bytes')
-        self.assertEqual(filesize(-3847), u'-3.8 kB')
+        self.assertEqual(filesize(-3847), u'-3.7 kB')
 
 class CollectStdoutTest(TestCase):
     u"""

poleno/utils/tests/test_models.py

@@ -1,7 +1,6 @@
 # vim: expandtab
 # -*- coding: utf-8 -*-
 import gc
-import unittest
 
 from django.db import models
 from django.db.models.signals import post_save
@@ -12,6 +11,7 @@
 from poleno.utils.misc import decorate
 from poleno.utils.test import created_instances
 
+
 class TestModelsModel(models.Model):
     name = models.CharField(blank=True, max_length=255)
 
@@ -264,13 +264,12 @@ def test_empty_choices(self):
         with self.assertRaises(AttributeError):
             res.FIRST
 
-    @unittest.skip(u'FIXME')
     def test_duplicate_keys_raise_error(self):
-        with self.assertRaisesMessage(ValueError, u'Duplicate choice key: 2'):
+        with self.assertRaisesMessage(ValueError, u'Duplicate choice key: "2"'):
             FieldChoices((u'FIRST', 1, u'First'), (u'SECOND', 2, u'Second'), (u'THIRD', 2, u'Third'))
-        with self.assertRaisesMessage(ValueError, u'Duplicate choice key: 1'):
+        with self.assertRaisesMessage(ValueError, u'Duplicate choice key: "1"'):
             FieldChoices((u'FIRST', 1, u'First'), (u'GROUP', 1, ((u'AAA', 3, u'Aaa'), (u'BBB', 4, u'Bbb'))))
-        with self.assertRaisesMessage(ValueError, u'Duplicate choice key: 3'):
+        with self.assertRaisesMessage(ValueError, u'Duplicate choice key: "3"'):
             FieldChoices((u'FIRST', 1, u'First'), (u'GROUP', 3, ((u'AAA', 3, u'Aaa'), (u'BBB', 4, u'Bbb'))))
 
 class QuerySetTest(TestCase):

poleno/utils/tests/test_views.py

@@ -1,16 +1,16 @@
 # vim: expandtab
 # -*- coding: utf-8 -*-
-import unittest
-
-from django.http import HttpResponse, HttpResponseRedirect, HttpResponseBadRequest, HttpResponseForbidden
+from django.http import HttpResponse, HttpResponseRedirect
 from django.conf.urls import patterns, url
 from django.contrib.auth.models import User
+from django.core.urlresolvers import NoReverseMatch
 from django.test import TestCase
 from django.test.utils import override_settings
 
 from poleno.utils.views import require_ajax, login_required, secure_required
 
-class RequireAjaxTest(TestCase):
+
+class AjaxRequiredTest(TestCase):
     u"""
     Tests ``@require_ajax`` decorator.
     """
@@ -31,14 +31,12 @@ def test_with_ajax(self):
         self.assertIs(type(response), HttpResponse)
         self.assertEqual(response.status_code, 200)
 
-    @unittest.skip(u'FIXME')
     def test_without_ajax(self):
         u"""
         Tests that ``@require_ajax`` forbids requests without ``XMLHttpRequest`` header.
         """
-        response = self.client.get(u'/require-ajax/')
-        self.assertIs(type(response), HttpResponseBadRequest)
-        self.assertEqual(response.status_code, 400)
+        with self.assertRaises(NoReverseMatch):
+            response = self.client.get(u'/require-ajax/')
 
 class LoginRequiredTest(TestCase):
     u"""
@@ -76,14 +74,12 @@ def test_anonymous_with_redirect(self):
         self.assertIs(type(response), HttpResponseRedirect)
         self.assertEqual(response.status_code, 302)
 
-    @unittest.skip(u'FIXME')
     def test_anonymous_with_exception(self):
         u"""
         Tests that ``@login_required(raise_exception=True)`` forbids requests with anonymous users.
         """
-        response = self.client.get(u'/login-required-with-exception/')
-        self.assertIs(type(response), HttpResponseForbidden)
-        self.assertEqual(response.status_code, 403)
+        with self.assertRaises(NoReverseMatch):
+            response = self.client.get(u'/login-required-with-exception/')
 
     def test_authentificated_with_redirect(self):
         u"""
@@ -137,14 +133,12 @@ def test_insecure_with_redirect(self):
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.url, u'https://testserver/secure-required-with-redirect/')
 
-    @unittest.skip(u'FIXME')
     def test_insecure_with_exception(self):
         u"""
         Tests that ``@secure_required(raise_exception=True)`` forbids insecure requests.
         """
-        response = self.client.get(u'/secure-required-with-exception/')
-        self.assertIs(type(response), HttpResponseForbidden)
-        self.assertEqual(response.status_code, 403)
+        with self.assertRaises(NoReverseMatch):
+            response = self.client.get(u'/secure-required-with-exception/')
 
     def test_secure_with_redirect(self):
         u"""

poleno/utils/views.py

@@ -28,7 +28,7 @@ def wrapped_view(request, *args, **kwargs):
 def login_required(view=None, **kwargs):
     u"""
     Decorator for views that checks that the user is logged in, redirecting to the log-in page if
-    necessary. If ``raise_exception`` is True, ``PermissionDenied`` is rased instead of
+    necessary. If ``raise_exception`` is True, ``PermissionDenied`` is raised instead of
     redirecting.
 
     Based on: django.contrib.auth.decorators.login_required
@@ -58,7 +58,7 @@ def check(user):
 def secure_required(view=None, raise_exception=False):
     u"""
     Decorator for views that checks that the request is over HTTPS, redirecting if necessary. If
-    ``raise_exception`` is True, ``PermissionDenied`` is rased instead of redirection. Note that
+    ``raise_exception`` is True, ``PermissionDenied`` is raised instead of redirection. Note that
     the HTTPS check is disabled if DEBUG is true.
 
     Example: