Switching from a custom user model to a user profile *yikes*
This commit is contained in:
		@@ -1,11 +1,11 @@
 | 
			
		||||
from django.db import models as django_models
 | 
			
		||||
from lostplaces_app.models import Explorer
 | 
			
		||||
from django.contrib.auth.models import User
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def mock_user():
 | 
			
		||||
    explorer_list =  Explorer.objects.all()
 | 
			
		||||
    explorer_list =  User.objects.all()
 | 
			
		||||
    if len(explorer_list) <= 0:
 | 
			
		||||
        return Explorer.objects.create_user(
 | 
			
		||||
        return User.objects.create_user(
 | 
			
		||||
            username='testpeter',
 | 
			
		||||
            password='Develop123'
 | 
			
		||||
        )
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ def mock_place_image():
 | 
			
		||||
        filename=mock.MagicMock(spec=File, name='FileMock'),
 | 
			
		||||
        place=mock_place(),
 | 
			
		||||
        submitted_when=datetime.datetime.now(),
 | 
			
		||||
        submitted_by=mock_user()
 | 
			
		||||
        submitted_by=mock_user().explorer
 | 
			
		||||
    )
 | 
			
		||||
 | 
			
		||||
class TestPlaceImage(TestSubmittable, TestCase):
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@ def mock_place():
 | 
			
		||||
    place = Place.objects.create(
 | 
			
		||||
        name='Im a place',
 | 
			
		||||
        submitted_when=datetime.datetime.now(),
 | 
			
		||||
        submitted_by=mock_user(),
 | 
			
		||||
        submitted_by=mock_user().explorer,
 | 
			
		||||
        location='Testtown',
 | 
			
		||||
        latitude=50.5,
 | 
			
		||||
        longitude=7.0,
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@ from django.urls import reverse_lazy
 | 
			
		||||
 | 
			
		||||
from lostplaces_app.models import Place
 | 
			
		||||
 | 
			
		||||
from lostplaces_app.models import Explorer
 | 
			
		||||
from django.contrib.auth.models import User
 | 
			
		||||
from lostplaces_app.tests.models.test_place_model import mock_place
 | 
			
		||||
from lostplaces_app.tests import mock_user
 | 
			
		||||
 | 
			
		||||
@@ -23,7 +23,7 @@ class TestIsAuthenticated(TestCase):
 | 
			
		||||
        response = self.client.get(url, follow=True)
 | 
			
		||||
        self.assertRedirects(
 | 
			
		||||
            response=response,
 | 
			
		||||
            expected_url='?'.join([str(reverse_lazy('login')), 'redirect_to=/place/1/']),
 | 
			
		||||
            expected_url='?'.join([str(reverse_lazy('login')), 'next=/place/1/']),
 | 
			
		||||
            status_code=302, 
 | 
			
		||||
            target_status_code=200, 
 | 
			
		||||
            msg_prefix='''Accesing an IsAuthenticated view while not logged should
 | 
			
		||||
@@ -47,7 +47,7 @@ class TestIsPlaceSubmitter(TestCase):
 | 
			
		||||
        self.assertEqual(response.status_code, 200)
 | 
			
		||||
 | 
			
		||||
    def test_is_no_submitter(self):
 | 
			
		||||
        Explorer.objects.create_user(
 | 
			
		||||
        User.objects.create_user(
 | 
			
		||||
            username='manfred',
 | 
			
		||||
            password='Develop123'
 | 
			
		||||
        )
 | 
			
		||||
 
 | 
			
		||||
@@ -23,7 +23,7 @@ class TestPlaceCreateView(TestCase):
 | 
			
		||||
        response = self.client.get(url)
 | 
			
		||||
        self.assertRedirects(
 | 
			
		||||
            response=response,
 | 
			
		||||
            expected_url='?'.join([str(reverse_lazy('login')), 'redirect_to=/place/1/']),
 | 
			
		||||
            expected_url='?'.join([str(reverse_lazy('login')), 'next=/place/1/']),
 | 
			
		||||
            status_code=302, 
 | 
			
		||||
            target_status_code=200, 
 | 
			
		||||
            msg_prefix='''Accesing PlaceDetailView while not logged should
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user