Change MultipleModelField to error on non-iterable

mixxorz · Mar 21, 2018 · 24dbbfe · 24dbbfe
1 parent 0f594a9
commit 24dbbfe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/service_objects/fields.py b/service_objects/fields.py
@@ -128,9 +128,11 @@ class MultipleModelField(ModelField):
             the database
 
     """
+    error_non_list = _("Object is not iterable")
+
     def clean(self, values):
         if not isinstance(values, list):
-            values = [values]
+            raise ValidationError(self.error_non_list)
 
         for value in values:
             self.check_type(value)

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -134,16 +134,13 @@ def test_multiple_unsaved_false(self):
         with self.assertRaisesRegexp(ValidationError, "[Uu]nsaved"):
             cleaned_data = model_field.clean(objects)
 
-
     def test_multiple_non_list(self):
         model_field = MultipleModelField(FooModel)
         obj = FooModel(one='a')
         obj.pk = 1
 
-        cleaned_data = model_field.clean(obj)
-
-        self.assertTrue(isinstance(cleaned_data, list))
-        self.assertEqual(obj, cleaned_data[0])
+        with self.assertRaisesRegexp(ValidationError, "[Ii]terable"):
+            cleaned_data = model_field.clean(obj)
 
     def test_multiple_valid(self):
         model_field = MultipleModelField(FooModel)