Changeset 8603

Timestamp:

08/26/08 16:33:56 (3 months ago)

Author:

jacob

Message:

Fixed #6893: FormWizard now properly updates its step value. Thanks, siddhi and wamberg.

Files:

• django/trunk/django/contrib/formtools/tests.py (modified) (2 diffs)
• django/trunk/django/contrib/formtools/wizard.py (modified) (2 diffs)

django/trunk/django/contrib/formtools/tests.py

@@ -1 +1 @@
-from django import forms
-
+, wizard
-from django import http
-from django.test import TestCase
@@ -102 +102 @@
-        self.assertEqual(response.content, success_string)
-
+#
+# FormWizard tests
+#
+
+class WizardPageOneForm(forms.Form):
+    field = forms.CharField()
+
+class WizardPageTwoForm(forms.Form):
+    field = forms.CharField()
+
+class WizardClass(wizard.FormWizard):
+    def render_template(self, *args, **kw):
+        return ""
+
+    def done(self, request, cleaned_data):
+        return http.HttpResponse(success_string)
+
+class DummyRequest(object):
+    def __init__(self, POST=None):
+        self.method = POST and "POST" or "GET"
+        self.POST = POST
+
+class WizardTests(TestCase):
+    def test_step_starts_at_zero(self):
+        """
+        step should be zero for the first form
+        """
+        wizard = WizardClass([WizardPageOneForm, WizardPageTwoForm])
+        request = DummyRequest()
+        wizard(request)
+        self.assertEquals(0, wizard.step)
+
+    def test_step_increments(self):
+        """
+        step should be incremented when we go to the next page
+        """
+        wizard = WizardClass([WizardPageOneForm, WizardPageTwoForm])
+        request = DummyRequest(POST={"0-field":"test", "wizard_step":"0"})
+        response = wizard(request)
+        self.assertEquals(1, wizard.step)
+

django/trunk/django/contrib/formtools/wizard.py

@@ -93 +93 @@
-            else:
-                form = self.get_form(next_step)
-
+self.step = 
-
-        return self.render(form, request, current_step)
@@ -204 +204 @@
-        context = context or {}
-        context.update(self.extra_context)
-elf.s
+
-            step_field=self.step_field_name,
-            step0=step,