remove unnecessary conditions + improve test cov

Author: bagerard

mongoengine/base/datastructures.py

@@ -31,7 +31,7 @@ def mark_key_as_changed_wrapper(parent_method):
 
     def wrapper(self, key, *args, **kwargs):
         # Can't use super() in the decorator.
-        if not args or not key or key not in self or self[key] != args[0]:
+        if not args or key not in self or self[key] != args[0]:
             self._mark_as_changed(key)
         return parent_method(self, key, *args, **kwargs)
 

mongoengine/base/document.py

@@ -516,9 +516,6 @@ def __expand_dynamic_values(self, name, value):
 
     def _mark_as_changed(self, key):
         """Mark a key as explicitly changed by the user."""
-        if not key:
-            return
-
         if not hasattr(self, "_changed_fields"):
             return
 

tests/fields/test_datetime_field.py

@@ -9,7 +9,7 @@
 
 from mongoengine import *
 from mongoengine import connection
-from tests.utils import MongoDBTestCase
+from tests.utils import MongoDBTestCase, get_as_pymongo
 
 
 class TestDateTimeField(MongoDBTestCase):
@@ -55,6 +55,21 @@ class Person(Document):
         assert person_created_t0 == person.created  # make sure it does not change
         assert person._data["created"] == person.created
 
+    def test_set_using_callable(self):
+        # Weird feature but it's there for a while so let's make sure we don't break it
+        class Person(Document):
+            created = DateTimeField()
+
+        Person.drop_collection()
+
+        person = Person()
+        frozen_dt = dt.datetime(2020, 7, 25, 9, 56, 1)
+        person.created = lambda: frozen_dt
+        person.save()
+
+        assert callable(person.created)
+        assert get_as_pymongo(person) == {"_id": person.id, "created": frozen_dt}
+
     def test_handling_microseconds(self):
         """Tests showing pymongo datetime fields handling of microseconds.
         Microseconds are rounded to the nearest millisecond and pre UTC

tests/queryset/test_queryset.py

@@ -2580,6 +2580,12 @@ def test_order_by(self):
         ages = [p.age for p in self.Person.objects.order_by("-name")]
         assert ages == [30, 40, 20]
 
+        ages = [p.age for p in self.Person.objects.order_by()]
+        assert ages == [40, 20, 30]
+
+        ages = [p.age for p in self.Person.objects.order_by("")]
+        assert ages == [40, 20, 30]
+
     def test_order_by_optional(self):
         class BlogPost(Document):
             title = StringField()