Ticket #17148: 17148.diff

docs/ref/contrib/formtools/form-wizard.txt

@@ -304 +304 @@
     Example to add extra variables for a specific step::
 
         def get_context_data(self, form, **kwargs):
-            context = super(MyWizard, self).get_context_data(form, **kwargs)
+            context = super(MyWizard, self).get_context_data(form=form, **kwargs)
             if self.steps.current == 'my_step_name':
                 context.update({'another_var': True})
             return context
@@ -431 +431 @@
 
         def render(self, form=None, **kwargs):
             form = form or self.get_form()
-            context = self.get_context_data(form, **kwargs)
+            context = self.get_context_data(form=form, **kwargs)
             return self.render_to_response(context)
 
 Providing initial data for the forms

django/contrib/formtools/wizard/views.py

@@ -535 +535 @@
         Returns a ``HttpResponse`` containing all needed context data.
         """
         form = form or self.get_form()
-        context = self.get_context_data(form, **kwargs)
+        context = self.get_context_data(form=form, **kwargs)
         return self.render_to_response(context)
 
     def done(self, form_list, **kwargs):
@@ -683 +683 @@
     A NamedUrlFormWizard with pre-configured CookieStorageBackend.
     """
     storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage'
-

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

@@ -1 +1 @@
 from __future__ import with_statement
 import os
 
+from django import forms
 from django.test import TestCase
+from django.test.client import RequestFactory
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.contrib.formtools.wizard.views import CookieWizardView
 
 
 class WizardTests(object):
@@ -280 +283 @@
                 TEMPLATE_DIRS=list(settings.TEMPLATE_DIRS) + [templates]):
             response = self.client.get(self.wizard_url)
             self.assertTemplateUsed(response, 'other_wizard_form.html')
+
+
+class WizardTestGenericViewInterface(TestCase):
+
+    def test_get_context_data(self):
+        class TestWizard(CookieWizardView):
+            """
+            A subclass that implements ``get_context_data`` using the standard
+            protocol for generic views (accept only **kwargs).
+
+            See ticket #17148.
+            """
+            def get_context_data(self, **kwargs):
+                return super(TestWizard, self).get_context_data(**kwargs)
+
+        factory = RequestFactory()
+        view = TestWizard.as_view([forms.Form])
+        view(factory.get('/'))

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

@@ -14 +14 @@
     SessionWizardTests,
     CookieWizardTests,
     WizardTestKwargs,
+    WizardTestGenericViewInterface,
 )