fix conflict

2019-02-21 21:27:08 +01:00
parent f0a3445250 6cfe6652a3
commit c8df3fd2a7
9 changed files with 636 additions and 499 deletions
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2234,6 +2234,19 @@ class QuerySetTest(unittest.TestCase):
        bar.reload()
        self.assertEqual(len(bar.foos), 0)

+    def test_update_one_check_return_with_full_result(self):
+        class BlogTag(Document):
+            name = StringField(required=True)
+
+        BlogTag.drop_collection()
+
+        BlogTag(name='garbage').save()
+        default_update = BlogTag.objects.update_one(name='new')
+        self.assertEqual(default_update, 1)
+
+        full_result_update = BlogTag.objects.update_one(name='new', full_result=True)
+        self.assertIsInstance(full_result_update, UpdateResult)
+
    def test_update_one_pop_generic_reference(self):

        class BlogTag(Document):