summaryrefslogtreecommitdiff
path: root/tests/generic_views
diff options
context:
space:
mode:
Diffstat (limited to 'tests/generic_views')
-rw-r--r--tests/generic_views/test_base.py10
-rw-r--r--tests/generic_views/urls.py3
2 files changed, 13 insertions, 0 deletions
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py
index d855a3829b..ce3a0f52d6 100644
--- a/tests/generic_views/test_base.py
+++ b/tests/generic_views/test_base.py
@@ -5,6 +5,7 @@ import unittest
import warnings
from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import resolve
from django.http import HttpResponse
from django.utils import six
from django.utils.deprecation import RemovedInDjango19Warning
@@ -329,6 +330,15 @@ class TemplateViewTest(TestCase):
response = self.client.get('/template/content_type/')
self.assertEqual(response['Content-Type'], 'text/plain')
+ def test_resolve_view(self):
+ match = resolve('/template/content_type/')
+ self.assertIs(match.func.view_class, TemplateView)
+ self.assertEqual(match.func.view_initkwargs['content_type'], 'text/plain')
+
+ def test_resolve_login_required_view(self):
+ match = resolve('/template/login_required/')
+ self.assertIs(match.func.view_class, TemplateView)
+
@ignore_warnings(category=RemovedInDjango19Warning)
@override_settings(ROOT_URLCONF='generic_views.urls')
diff --git a/tests/generic_views/urls.py b/tests/generic_views/urls.py
index 1bef0a8b77..e09ee12562 100644
--- a/tests/generic_views/urls.py
+++ b/tests/generic_views/urls.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
from django.conf.urls import url
from django.contrib.auth import views as auth_views
+from django.contrib.auth.decorators import login_required
from django.views.decorators.cache import cache_page
from django.views.generic import TemplateView
@@ -14,6 +15,8 @@ urlpatterns = [
# TemplateView
url(r'^template/no_template/$',
TemplateView.as_view()),
+ url(r'^template/login_required/$',
+ login_required(TemplateView.as_view())),
url(r'^template/simple/(?P<foo>\w+)/$',
TemplateView.as_view(template_name='generic_views/about.html')),
url(r'^template/custom/(?P<foo>\w+)/$',