Merge pull request #197 from Nobatek/dev_JL_wtforms_InputRequired

Use InputRequired validator instead of Required for required field

Author: losintikfos

flask_mongoengine/wtf/orm.py

@@ -59,7 +59,7 @@ def convert(self, model, field, field_args):
             kwargs['validators'] = list(kwargs['validators'])
 
         if field.required:
-            kwargs['validators'].append(validators.Required())
+            kwargs['validators'].append(validators.InputRequired())
         else:
             kwargs['validators'].append(validators.Optional())
 

tests/test_forms.py

@@ -119,31 +119,32 @@ class TextPost(BlogPost):
 
             class LinkPost(BlogPost):
                 url = db.StringField(required=True)
+                interest =  db.DecimalField(required=True)
 
             # Create a text-based post
             TextPostForm = model_form(TextPost)
 
-            form = TextPostForm(**{
+            form = TextPostForm(MultiDict({
                 'title': 'Using MongoEngine',
-                'tags': ['mongodb', 'mongoengine']})
+                'tags': ['mongodb', 'mongoengine']}))
 
             self.assertFalse(form.validate())
 
-            form = TextPostForm(**{
+            form = TextPostForm(MultiDict({
                 'title': 'Using MongoEngine',
                 'content': 'See the tutorial',
-                'tags': ['mongodb', 'mongoengine']})
+                'tags': ['mongodb', 'mongoengine']}))
 
             self.assertTrue(form.validate())
             form.save()
 
             self.assertEquals(BlogPost.objects.first().title, 'Using MongoEngine')
             self.assertEquals(BlogPost.objects.count(), 1)
 
-            form = TextPostForm(**{
+            form = TextPostForm(MultiDict({
                 'title': 'Using Flask-MongoEngine',
                 'content': 'See the tutorial',
-                'tags': ['flask', 'mongodb', 'mongoengine']})
+                'tags': ['flask', 'mongodb', 'mongoengine']}))
 
             self.assertTrue(form.validate())
             form.save()
@@ -165,6 +166,17 @@ class LinkPost(BlogPost):
 
             self.assertEqual(post.tags, ['flask', 'mongodb', 'mongoengine', 'flask-mongoengine'])
 
+            # Create a link post
+            LinkPostForm = model_form(LinkPost)
+
+            form = LinkPostForm(MultiDict({
+                'title': 'Using Flask-MongoEngine',
+                'url': 'http://flask-mongoengine.org',
+                'interest': '0',
+            }))
+            form.validate()
+            self.assertTrue(form.validate())
+
     def test_model_form_only(self):
         with self.app.test_request_context('/'):
             db = self.db