Improves tests for `wagtailforms` (#2546)

wagtail/wagtailforms/tests.py

@@ -162,7 +162,97 @@ class TestFormSubmission(TestCase):
 class TestFormBuilder(TestCase):
     def setUp(self):
         # Create a form page
-        self.form_page = make_form_page()
+        home_page = Page.objects.get(url_path='/home/')
+
+        self.form_page = home_page.add_child(instance=FormPage(
+            title="Contact us",
+            slug="contact-us",
+            to_address="to@email.com",
+            from_address="from@email.com",
+            subject="The subject",
+        ))
+
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=1,
+            label="Your name",
+            field_type='singleline',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your message",
+            field_type='multiline',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your birthday",
+            field_type='date',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your birthtime :)",
+            field_type='datetime',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=1,
+            label="Your email",
+            field_type='email',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your homepage",
+            field_type='url',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your favourite number",
+            field_type='number',
+            required=True,
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your favourite Python IDEs",
+            field_type='dropdown',
+            required=True,
+            choices='PyCharm,vim,nano',
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=2,
+            label="Your favourite Python IDE",
+            help_text="Choose one",
+            field_type='radio',
+            required=True,
+            choices='PyCharm,vim,nano',
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=3,
+            label="Your choices",
+            field_type='checkboxes',
+            required=False,
+            choices='foo,bar,baz',
+        )
+        FormField.objects.create(
+            page=self.form_page,
+            sort_order=3,
+            label="I agree to the Terms of Use",
+            field_type='checkbox',
+            required=True,
+        )
 
         # Create a form builder
         self.fb = FormBuilder(self.form_page.form_fields.all())
@@ -173,11 +263,37 @@ class TestFormBuilder(TestCase):
         """
         form_class = self.fb.get_form_class()
 
-        self.assertIn('your-email', form_class.base_fields.keys())
+        # All fields are present in form
-        self.assertIn('your-message', form_class.base_fields.keys())
+        field_names = form_class.base_fields.keys()
+        self.assertIn('your-name', field_names)
+        self.assertIn('your-message', field_names)
+        self.assertIn('your-birthday', field_names)
+        self.assertIn('your-birthtime', field_names)
+        self.assertIn('your-email', field_names)
+        self.assertIn('your-homepage', field_names)
+        self.assertIn('your-favourite-number', field_names)
+        self.assertIn('your-favourite-python-ides', field_names)
+        self.assertIn('your-favourite-python-ide', field_names)
+        self.assertIn('your-choices', field_names)
+        self.assertIn('i-agree-to-the-terms-of-use', field_names)
 
-        self.assertIsInstance(form_class.base_fields['your-email'], forms.EmailField)
+        # All fields have proper type
+        self.assertIsInstance(form_class.base_fields['your-name'], forms.CharField)
         self.assertIsInstance(form_class.base_fields['your-message'], forms.CharField)
+        self.assertIsInstance(form_class.base_fields['your-birthday'], forms.DateField)
+        self.assertIsInstance(form_class.base_fields['your-birthtime'], forms.DateTimeField)
+        self.assertIsInstance(form_class.base_fields['your-email'], forms.EmailField)
+        self.assertIsInstance(form_class.base_fields['your-homepage'], forms.URLField)
+        self.assertIsInstance(form_class.base_fields['your-favourite-number'], forms.DecimalField)
+        self.assertIsInstance(form_class.base_fields['your-favourite-python-ides'], forms.ChoiceField)
+        self.assertIsInstance(form_class.base_fields['your-favourite-python-ide'], forms.ChoiceField)
+        self.assertIsInstance(form_class.base_fields['your-choices'], forms.MultipleChoiceField)
+        self.assertIsInstance(form_class.base_fields['i-agree-to-the-terms-of-use'], forms.BooleanField)
+
+        # Some fields have non-default widgets
+        self.assertIsInstance(form_class.base_fields['your-message'].widget, forms.Textarea)
+        self.assertIsInstance(form_class.base_fields['your-favourite-python-ide'].widget, forms.RadioSelect)
+        self.assertIsInstance(form_class.base_fields['your-choices'].widget, forms.CheckboxSelectMultiple)
 
 
 class TestFormsIndex(TestCase):