Ticket #17795: t17795.2.diff

django/views/generic/dates.py

@@ -171 +171 @@
     def get(self, request, *args, **kwargs):
         self.date_list, self.object_list, extra_context = self.get_dated_items()
         context = self.get_context_data(object_list=self.object_list,
-                                        date_list=self.date_list)
+                                        date_list=self.date_list, **kwargs)
         context.update(extra_context)
         return self.render_to_response(context)
 

django/views/generic/detail.py

@@ -96 +96 @@
 class BaseDetailView(SingleObjectMixin, View):
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
-        context = self.get_context_data(object=self.object)
+        context = self.get_context_data(object=self.object, **kwargs)
         return self.render_to_response(context)
 
 

django/views/generic/edit.py

@@ -129 +129 @@
     def get(self, request, *args, **kwargs):
         form_class = self.get_form_class()
         form = self.get_form(form_class)
-        return self.render_to_response(self.get_context_data(form=form))
+        return self.render_to_response(
+            self.get_context_data(form=form, **kwargs),
+        )
 
     def post(self, request, *args, **kwargs):
         form_class = self.get_form_class()

django/views/generic/list.py

@@ -116 +116 @@
         if not allow_empty and len(self.object_list) == 0:
             raise Http404(_(u"Empty list and '%(class_name)s.allow_empty' is False.")
                           % {'class_name': self.__class__.__name__})
-        context = self.get_context_data(object_list=self.object_list)
+        context = self.get_context_data(object_list=self.object_list, **kwargs)
         return self.render_to_response(context)
 
 

tests/regressiontests/generic_views/dates.py

@@ -3 +3 @@
 import datetime
 
 from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.test.client import RequestFactory
 
+from . import views
 from .models import Book
 
 
@@ -21 +24 @@
                 pubdate=base_date - datetime.timedelta(days=1))
 
     def test_archive_view(self):
-        res = self.client.get('/dates/books/')
+        res = self.client.get(reverse('books_archive'))
         self.assertEqual(res.status_code, 200)
         self.assertEqual(res.context['date_list'], Book.objects.dates('pubdate', 'year')[::-1])
         self.assertEqual(list(res.context['latest']), list(Book.objects.all()))
@@ -37 +40 @@
 
     def test_empty_archive_view(self):
         Book.objects.all().delete()
-        res = self.client.get('/dates/books/')
+        res = self.client.get(reverse('books_archive'))
         self.assertEqual(res.status_code, 404)
 
     def test_allow_empty_archive_view(self):
@@ -78 +81 @@
         self.assertEqual(res.context['page_obj'].number, 2)
         self.assertEqual(list(res.context['latest']), list(Book.objects.all()[10:20]))
 
+    def test_datebaselistview_regression_t17795(self):
+        factory = RequestFactory()
+        request = factory.get(reverse('books_archive'))
+        res = views.BookArchive.as_view()(request, foo='bar')
+        self.assertEqual(res.context_data.get('foo'), 'bar',
+            msg='context_data now contains the foo kwargs')
+
 
 class YearArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
@@ -132 +142 @@
         res = self.client.get('/dates/books/no_year/')
         self.assertEqual(res.status_code, 404)
 
+
 class MonthArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
     urls = 'regressiontests.generic_views.urls'
@@ -291 +302 @@
         self.assertEqual(res.status_code, 200)
         self.assertEqual(res.context['week'], datetime.date(2008, 9, 29))
 
+
 class DayArchiveViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
     urls = 'regressiontests.generic_views.urls'
@@ -373 +385 @@
         self.assertEqual(res.status_code, 404)
 
     def test_today_view(self):
-        res = self.client.get('/dates/books/today/')
+        res = self.client.get(reverse('today_books'))
         self.assertEqual(res.status_code, 404)
         res = self.client.get('/dates/books/today/allow_empty/')
         self.assertEqual(res.status_code, 200)
         self.assertEqual(res.context['day'], datetime.date.today())
 
+
 class DateDetailViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
     urls = 'regressiontests.generic_views.urls'

tests/regressiontests/generic_views/detail.py

@@ -1 +1 @@
 from __future__ import absolute_import
 
 from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.test.client import RequestFactory
 
+from . import views
 from .models import Artist, Author, Page
 
 
-class DetailViewTest(TestCase):
+class DetailViewTests(TestCase):
     fixtures = ['generic-views-test-data.json']
     urls = 'regressiontests.generic_views.urls'
 
@@ -92 +95 @@
 
     def test_invalid_queryset(self):
         self.assertRaises(ImproperlyConfigured, self.client.get, '/detail/author/invalid/qs/')
+
+    def test_detailview_regression_t17795(self):
+        factory = RequestFactory()
+        request = factory.get(reverse('author_detail', kwargs={'pk': 1}))
+        res = views.AuthorDetail.as_view()(request, pk='1', foo='bar')
+        self.assertEqual(res.context_data.get('foo'), 'bar',
+            msg='context_data now contains the foo kwargs')

tests/regressiontests/generic_views/edit.py

@@ -4 +4 @@
 from django.core.urlresolvers import reverse
 from django import forms
 from django.test import TestCase
+from django.test.client import RequestFactory
 from django.utils.unittest import expectedFailure
 
 from . import views
@@ -15 +16 @@
         form_class = views.AuthorGetQuerySetFormView().get_form_class()
         self.assertEqual(form_class._meta.model, Author)
 
+
 class CreateViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 
@@ -92 +94 @@
         self.assertEqual(res.status_code, 302)
         self.assertRedirects(res, 'http://testserver/accounts/login/?next=/edit/authors/create/restricted/')
 
+    def test_createview_regression_t17795(self):
+        factory = RequestFactory()
+        request = factory.get(reverse('author_create'))
+        res = views.AuthorCreate.as_view()(request, foo='bar')
+        self.assertEqual(res.context_data.get('foo'), 'bar',
+            msg='context_data now contains the foo kwargs')
+
+
 class UpdateViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 
@@ -228 +238 @@
         self.assertRedirects(res, 'http://testserver/list/authors/')
         self.assertQuerysetEqual(Author.objects.all(), ['<Author: Randall Munroe (xkcd)>'])
 
+
 class DeleteViewTests(TestCase):
     urls = 'regressiontests.generic_views.urls'
 
@@ -284 +295 @@
             self.fail('Should raise exception -- No redirect URL provided, and no get_absolute_url provided')
         except ImproperlyConfigured:
             pass
-

tests/regressiontests/generic_views/list.py

@@ -1 +1 @@
 from __future__ import absolute_import
 
 from django.core.exceptions import ImproperlyConfigured
+from django.core.urlresolvers import reverse
 from django.test import TestCase
+from django.test.client import RequestFactory
 
+from . import views
 from .models import Author, Artist
 
 
@@ -164 +167 @@
         for i in range(n):
             Author.objects.create(name='Author %02i' % i, slug='a%s' % i)
 
+    def test_listview_regression_t17795(self):
+        factory = RequestFactory()
+        request = factory.get(reverse('authors_list'))
+        res = views.AuthorList.as_view()(request, foo='bar')
+        self.assertEqual(res.context_data.get('foo'), 'bar',
+            msg='context_data now contains the foo kwargs')

tests/regressiontests/generic_views/tests.py

@@ -4 +4 @@
 from .dates import (ArchiveIndexViewTests, YearArchiveViewTests,
     MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests,
     DateDetailViewTests)
-from .detail import DetailViewTest
+from .detail import DetailViewTests
 from .edit import (ModelFormMixinTests, CreateViewTests, UpdateViewTests,
     DeleteViewTests)
 from .list import ListViewTests

tests/regressiontests/generic_views/urls.py

@@ -28 +28 @@
         views.ObjectDetail.as_view()),
     url(r'^detail/artist/(?P<pk>\d+)/$',
         views.ArtistDetail.as_view(),
-        name="artist_detail"),
+        name='artist_detail'),
     url(r'^detail/author/(?P<pk>\d+)/$',
         views.AuthorDetail.as_view(),
-        name="author_detail"),
+        name='author_detail'),
     (r'^detail/author/bycustompk/(?P<foo>\d+)/$',
         views.AuthorDetail.as_view(pk_url_kwarg='foo')),
     (r'^detail/author/byslug/(?P<slug>[\w-]+)/$',
@@ -54 +54 @@
         views.AuthorDetail.as_view(queryset=None)),
 
     # Create/UpdateView
-    (r'^edit/artists/create/$',
-        views.ArtistCreate.as_view()),
+    url(r'^edit/artists/create/$',
+        views.ArtistCreate.as_view(),
+        name='author_create'),
     (r'^edit/artists/(?P<pk>\d+)/update/$',
         views.ArtistUpdate.as_view()),
 
@@ -94 +95 @@
         views.SpecializedAuthorDelete.as_view()),
 
     # ArchiveIndexView
-    (r'^dates/books/$',
-        views.BookArchive.as_view()),
+    url(r'^dates/books/$',
+        views.BookArchive.as_view(),
+        name='books_archive'),
     (r'^dates/books/context_object_name/$',
         views.BookArchive.as_view(context_object_name='thingies')),
     (r'^dates/books/allow_empty/$',
@@ -116 +118 @@
         views.DictList.as_view(paginate_by=1)),
     url(r'^list/artists/$',
         views.ArtistList.as_view(),
-        name="artists_list"),
+        name='artists_list'),
     url(r'^list/authors/$',
         views.AuthorList.as_view(),
-        name="authors_list"),
+        name='authors_list'),
     (r'^list/authors/paginated/$',
         views.AuthorList.as_view(paginate_by=30)),
     (r'^list/authors/paginated/(?P<page>\d+)/$',
@@ -200 +202 @@
         views.BookDayArchive.as_view()),
 
     # TodayArchiveView
-    (r'dates/books/today/$',
-        views.BookTodayArchive.as_view()),
+    url(r'dates/books/today/$',
+        views.BookTodayArchive.as_view(),
+        name='today_books'),
     (r'dates/books/today/allow_empty/$',
         views.BookTodayArchive.as_view(allow_empty=True)),