Merge branch 'feature/unit-test', #4

polls/models.py

@@ -1,7 +1,9 @@
-from django.db import models
 from django.contrib.auth.models import User
+from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 
+@python_2_unicode_compatible
 class Poll(models.Model):
     question = models.CharField(max_length=255)
     description = models.TextField(blank=True)
@@ -18,7 +20,7 @@ def count_total_votes(self):
     def can_vote(self, user):
         return not self.vote_set.filter(user=user).exists()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.question
 
 

runtests.py

@@ -7,7 +7,7 @@
 from django.test.utils import get_runner
 
 if __name__ == "__main__":
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_settings'
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.settings'
     django.setup()
     TestRunner = get_runner(settings)
     test_runner = TestRunner()

tests/test_settings.py → tests/settings.py

@@ -1,6 +1,7 @@
 SECRET_KEY = 'fake-key'
 
 INSTALLED_APPS = [
+    'polls',
     'tests',
 ]
 

tests/test_models.py

@@ -0,0 +1,26 @@
+import sys
+from django.test import TestCase
+
+from polls.models import Poll
+
+
+class PollTests(TestCase):
+    def setUp(self):
+        self.poll = Poll.objects.create(
+            question='How are you?'
+        )
+
+    def test_model_creation(self):
+        self.assertIsNotNone(self.poll)
+        self.assertIsInstance(self.poll, Poll)
+
+    def test_model_save(self):
+        self.poll.save()
+        self.assertIsNotNone(self.poll.pk)
+        self.assertTrue(self.poll.pk > 0)
+
+    def test_to_string(self):
+        if sys.version_info > (3,):
+            self.assertEquals(str(self.poll), 'How are you?')
+        else:
+            self.assertEquals(unicode(self.poll), 'How are you?')