Commit d35e6216 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.5.x] Fixed #20048, #20060 -- Modified tests for contrib apps sensitive to custom User models. 

Thanks to matiasb for the report of #20060 and the draft patch for #20048.

(cherry picked from commit 930af661)
parent f7ca4640

django/contrib/flatpages/tests/csrf.py

+2 −0
Original line number Diff line number Diff line 
import os

from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.test import TestCase, Client

from django.test.utils import override_settings
@@ -38,6 +39,7 @@ class FlatpageCSRFTests(TestCase): 
        response = self.client.get('/flatpage_root/no_such_flatpage/')

        self.assertEqual(response.status_code, 404)



    @skipIfCustomUser

    def test_view_authenticated_flatpage(self):

        "A flatpage served through a view can require authentication"

        response = self.client.get('/flatpage_root/sekrit/')

django/contrib/flatpages/tests/middleware.py

+3 −0
Original line number Diff line number Diff line 
import os

from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.contrib.flatpages.models import FlatPage

from django.test import TestCase

from django.test.utils import override_settings
@@ -36,6 +37,7 @@ class FlatpageMiddlewareTests(TestCase): 
        response = self.client.get('/flatpage_root/no_such_flatpage/')

        self.assertEqual(response.status_code, 404)



    @skipIfCustomUser

    def test_view_authenticated_flatpage(self):

        "A flatpage served through a view can require authentication"

        response = self.client.get('/flatpage_root/sekrit/')
@@ -57,6 +59,7 @@ class FlatpageMiddlewareTests(TestCase): 
        response = self.client.get('/no_such_flatpage/')

        self.assertEqual(response.status_code, 404)



    @skipIfCustomUser

    def test_fallback_authenticated_flatpage(self):

        "A flatpage served by the middleware can require authentication"

        response = self.client.get('/sekrit/')

django/contrib/flatpages/tests/templatetags.py

+7 −5
Original line number Diff line number Diff line 
import os

from django.conf import settings

from django.contrib.auth.models import AnonymousUser, User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.template import Template, Context, TemplateSyntaxError

from django.test import TestCase

from django.test.utils import override_settings
@@ -24,9 +25,6 @@ class FlatpageTemplateTagTests(TestCase): 
    fixtures = ['sample_flatpages']

    urls = 'django.contrib.flatpages.tests.urls'



    def setUp(self):

        self.me = User.objects.create_user('testuser', 'test@example.com', 's3krit')



    def test_get_flatpages_tag(self):

        "The flatpage template tag retrives unregistered prefixed flatpages by default"

        out = Template(
@@ -51,8 +49,10 @@ class FlatpageTemplateTagTests(TestCase): 
            }))

        self.assertEqual(out, "A Flatpage,A Nested Flatpage,")



    @skipIfCustomUser

    def test_get_flatpages_tag_for_user(self):

        "The flatpage template tag retrives all flatpages for an authenticated user"

        me = User.objects.create_user('testuser', 'test@example.com', 's3krit')

        out = Template(

                "{% load flatpages %}"

                "{% get_flatpages for me as flatpages %}"
@@ -60,7 +60,7 @@ class FlatpageTemplateTagTests(TestCase): 
                "{{ page.title }},"

                "{% endfor %}"

            ).render(Context({

                'me': self.me

                'me': me

            }))

        self.assertEqual(out, "A Flatpage,A Nested Flatpage,Sekrit Nested Flatpage,Sekrit Flatpage,")
@@ -88,8 +88,10 @@ class FlatpageTemplateTagTests(TestCase): 
            }))

        self.assertEqual(out, "A Nested Flatpage,")



    @skipIfCustomUser

    def test_get_flatpages_with_prefix_for_user(self):

        "The flatpage template tag retrive prefixed flatpages for an authenticated user"

        me = User.objects.create_user('testuser', 'test@example.com', 's3krit')

        out = Template(

                "{% load flatpages %}"

                "{% get_flatpages '/location/' for me as location_flatpages %}"
@@ -97,7 +99,7 @@ class FlatpageTemplateTagTests(TestCase): 
                "{{ page.title }},"

                "{% endfor %}"

            ).render(Context({

                'me': self.me

                'me': me

            }))

        self.assertEqual(out, "A Nested Flatpage,Sekrit Nested Flatpage,")

django/contrib/flatpages/tests/views.py

+2 −0
Original line number Diff line number Diff line 
import os

from django.conf import settings

from django.contrib.auth.models import User

from django.contrib.auth.tests.utils import skipIfCustomUser

from django.contrib.flatpages.models import FlatPage

from django.test import TestCase

from django.test.utils import override_settings
@@ -36,6 +37,7 @@ class FlatpageViewTests(TestCase): 
        response = self.client.get('/flatpage_root/no_such_flatpage/')

        self.assertEqual(response.status_code, 404)



    @skipIfCustomUser

    def test_view_authenticated_flatpage(self):

        "A flatpage served through a view can require authentication"

        response = self.client.get('/flatpage_root/sekrit/')

django/contrib/formtools/tests/wizard/cookiestorage.py

+2 −0
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ from django.core import signing 
from django.core.exceptions import SuspiciousOperation

from django.http import HttpResponse



from django.contrib.auth.tests.utils import skipIfCustomUser

from django.contrib.formtools.wizard.storage.cookie import CookieStorage

from django.contrib.formtools.tests.wizard.storage import get_request, TestStorage





@skipIfCustomUser

class TestCookieStorage(TestStorage, TestCase):

    def get_storage(self):

        return CookieStorage