lostplaces/lostplaces_app/tests/__init__.py

@@ -1,2 +1,11 @@
 from django.test import TestCase
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User
+
+class BaseData(TestCase):
+
+    @classmethod
+    def setUpTestData(cls):
+        User.objects.create_user(
+            username='testpeter',
+            password='Develop123'
+        ).save()

lostplaces/lostplaces_app/tests/models/__init__.py

@@ -14,7 +14,7 @@ class ModelTestCase:
 
     def setUp(self):
         self.object = self.model.objects.get(id=1)
-        self.model_name = self.model.__name__
+        self.model_name = type(self.model).__name__
 
     def _test_field(self, field_name, field_class, must_have={}, must_not_have={}):
         '''

lostplaces/lostplaces_app/tests/models/test_place_image_model.py

@@ -11,6 +11,7 @@ from django.contrib.auth.models import User
 
 from lostplaces_app.models import PlaceImage, Place
 from lostplaces_app.tests.models import SubmittableTestCase
+from lostplaces_app.tests.models.test_place_model import PlaceTestCase
 
 from easy_thumbnails.fields import ThumbnailerImageField
 
@@ -36,9 +37,6 @@ class TestPlaceImage(SubmittableTestCase, TestCase):
         place.tags.add('I a tag', 'testlocation')
         place.save()
 
-        if not os.path.isdir(settings.MEDIA_ROOT):
-            os.mkdir(settings.MEDIA_ROOT)
-
         current_dir = os.path.dirname(os.path.abspath(__file__))
         if not os.path.isfile(os.path.join(settings.MEDIA_ROOT, 'im_a_image_copy.jpeg')):
             shutil.copyfile(

lostplaces/lostplaces_app/tests/models/test_place_model.py

@@ -6,6 +6,7 @@ from django.db import models
 from django.contrib.auth.models import User
 
 from lostplaces_app.models import Place
+from lostplaces_app.tests import BaseData
 from lostplaces_app.tests.models import SubmittableTestCase
 
 

lostplaces/lostplaces_app/tests/views/__init__.py

@@ -1,28 +0,0 @@
-from django.test import Client
-
-class ViewTestCase:
-    view = None
-    
-    def setUp(self):
-        self.view_name = self.view.__name__
-        self. client = Client()
-    
-    def _test_has_context_key(self, response, context_key):
-        self.assertTrue( context_key in response.context,
-            msg='Expecting the context of %s to have an attribute \'%s\'' % (
-                self.view_name,
-                context_key
-            )
-        )
-        
-    def _test_form(self, response, context_key, form_class):
-        self._test_has_context_key(response, context_key)
-        self.assertEqual(
-            type(response.context[context_key]),
-            form_class,
-            msg='Expecting %s\'s context.%s to be of the type %s' % (
-                self.view_name,
-                context_key,
-                form_class.__name__
-            ) 
-        )

lostplaces/lostplaces_app/tests/views/test_place_views.py

@@ -1,20 +1,12 @@
 import datetime
 
-from django.test import TestCase
+from django.test import TestCase, Client
 from django.urls import reverse_lazy
 from django.contrib.auth.models import User
 
 from lostplaces_app.models import Place
-from lostplaces_app.views import (
-    PlaceCreateView,
-    PlaceListView
-)
-from lostplaces_app.forms import PlaceImageCreateForm, PlaceForm
-from lostplaces_app.tests.views import ViewTestCase
 
-class TestPlaceCreateView(ViewTestCase, TestCase):
+class TestPlaceCreateView(TestCase):
-    
-    view = PlaceCreateView
     
     @classmethod
     def setUpTestData(cls):
@@ -35,39 +27,26 @@ class TestPlaceCreateView(ViewTestCase, TestCase):
         place.tags.add('I a tag', 'testlocation')
         place.save()
         
-    def test_has_forms(self):
+    def setUp(self):
+        self. client = Client()
+
+    def test_url_logged_in(self):
         self.client.login(username='testpeter', password='Develop123')
-        response = self.client.get(reverse_lazy('place_create'))
+        response = self.client.get(reverse_lazy('place_detail', kwargs={'pk': 1}))
-        
+        self.assertEqual(response.status_code, 200)
-        self._test_form(response, 'place_image_form', PlaceImageCreateForm)
+
-        self._test_form(response, 'place_form', PlaceForm)
+    def test_url_not_logged_in(self):
-        
+        url = reverse_lazy('place_detail', kwargs={'pk': 1})
-class TestPlaceListView(ViewTestCase, TestCase):
+        response = self.client.get(url)
-    view = PlaceListView
+        self.assertRedirects(
-    
+            response=response,
-    @classmethod
+            expected_url='?'.join([str(reverse_lazy('login')), 'next=/place/1/']),
-    def setUpTestData(cls):
+            status_code=302, 
-        user = User.objects.create_user(
+            target_status_code=200, 
-            username='testpeter',
+            msg_prefix='''Accesing PlaceDetailView while not logged should
-            password='Develop123'
+            redirect to login page with redirect params
+            ''', 
+            fetch_redirect_response=True
         )
-        
+
-        place = Place.objects.create(
-            name='Im a place',
-            submitted_when=datetime.datetime.now(),
-            submitted_by=user.explorer,
-            location='Testtown',
-            latitude=50.5,
-            longitude=7.0,
-            description='This is just a test, do not worry'
-        )
-        place.tags.add('I a tag', 'testlocation')
-        place.save()
-        
-    def test_list_view(self):
-        self.client.login(username='testpeter', password='Develop123')
-        response = self.client.get(reverse_lazy('place_list'))
-        
-        self._test_has_context_key(response, 'place_map_center')
-