Merge pull request #221 from romulocollopy/master

Issue #216

.gitignore

@@ -11,3 +11,5 @@ share/
 .idea
 .tox
 build/
+lib64
+pyvenv.cfg

model_mommy/mommy.py

@@ -326,7 +326,7 @@ def _make(self, commit=True, **attrs):
     def m2m_value(self, field):
         if field.name in self.rel_fields:
             return self.generate_value(field)
-        if not self.make_m2m or field.null:
+        if not self.make_m2m or field.null and not field.fill_optional:
             return []
         return self.generate_value(field)
 

test/generic/tests/test_mommy.py

@@ -350,6 +350,22 @@ def test_skip_null(self):
         self.assertEqual(dummy.null_integer_field, None)
 
 
+class FillNullsTestCase(TestCase):
+    def test_create_nullable_many_to_many_if_flagged_and_fill_field_optional(
+        self):
+        classroom = mommy.make(Classroom, make_m2m=True, _fill_optional=[
+            'students'])
+        self.assertEqual(classroom.students.count(), 5)
+
+    def test_create_nullable_many_to_many_if_flagged_and_fill_optional(self):
+        classroom = mommy.make(Classroom, make_m2m=True, _fill_optional=True)
+        self.assertEqual(classroom.students.count(), 5)
+
+    def test_nullable_many_to_many_is_not_created_if_not_flagged_and_fill_optional(self):
+        classroom = mommy.make(Classroom, make_m2m=False, _fill_optional=True)
+        self.assertEqual(classroom.students.count(), 0)
+
+
 class SkipBlanksTestCase(TestCase):
     def test_skip_blank(self):
         dummy = mommy.make(DummyBlankFieldsModel)