Merge branch 'master' into 171_pg_array_field_contains_support

django_mock_queries/mocks.py

@@ -476,7 +476,7 @@ def _do_update(self, *args, **_):
         objects = self.objects.filter(pk=pk_val)
 
         if objects.exists():
-            attrs = {field.name: value for field, _, value in values if value is not None}
+            attrs = {field.attname: value for field, _, value in values if value is not None}
             self.objects.update(**attrs)
             return True
         else:

tests/test_mocks.py

@@ -435,6 +435,16 @@ def test_model_mocker_objects_create(self):
             obj = Car.objects.create(speed=10)
             self.assertEqual(Car.objects.get(pk=obj.id), obj)
 
+    def test_model_mocker_update_fk_from_instance(self):
+        with ModelMocker(Manufacturer):
+            with ModelMocker(Car, outer=False):
+                manufacturer = Manufacturer.objects.create(name='foo')
+                obj = Car.objects.create(speed=10, make=manufacturer)
+                obj.make = Manufacturer.objects.create(name='bar')
+                obj.save()
+
+                self.assertEqual(Car.objects.get(pk=obj.id).make.name, 'bar')
+
     def test_model_mocker_with_custom_method(self):
         with self.CarModelMocker(Car, 'validate_price') as mocker:
             obj = Car()