Allow defaults

django_pyvows/model_assertions.py

@@ -16,54 +16,55 @@ class Model(object):
         self.model = model
 
 @Vows.assertion
-def to_be_cruddable(topic):
+def to_be_cruddable(topic, defaults={}):
     import django.db.models.fields as fields
-    instance = __create_instance(topic)
+    instance = __create_or_update_instance(topic, None, defaults)
 
     assert instance, "An instance could not be created for model %s" % topic.model.__name__
 
     retrieved = topic.model.objects.get(id=instance.id)
     assert retrieved.id == instance.id, "An instance could not be retrieved for model %s with id %d" % (topic.model.__name__, instance.id)
 
-    updated = __update_instance(topic, retrieved)
+    for key, value in defaults.iteritems():
+        assert value == getattr(retrieved, key), "The default specified value of '%s' should have been set in the '%s' property of the instance but it was not" % (value, key)
+
+    updated = __create_or_update_instance(topic, retrieved, defaults)
 
     for field, value in topic.model._meta._field_cache:
         if field.__class__ == fields.AutoField:
             continue
 
+        if field.name in defaults:
+            continue
+
         assert getattr(updated, field.name) != getattr(instance, field.name), "The instance should have been updated but the field %s is the same in both the original instance and the updated one (%s)." % (field.name, getattr(updated, field.name))
 
     instance.delete()
     object_count = topic.model.objects.count()
     assert object_count == 0, "Object should have been deleted, but it wasn't (count: %d)" % object_count
 
-def __create_instance(topic):
+def __create_or_update_instance(topic, instance, defaults):
     import django.db.models.fields as fields
     arguments = {}
     for field, value in topic.model._meta._field_cache:
         if field.__class__ == fields.AutoField:
             continue
 
-        if field.__class__ == fields.CharField:
+        if field.name in defaults:
-            __add_char_value_for(field, None, arguments)
+            arguments[field.name] = defaults[field.name]
-
-    return topic.model.objects.create(**arguments)
-
-def __update_instance(topic, instance):
-    import django.db.models.fields as fields
-    arguments = {}
-    for field, value in topic.model._meta._field_cache:
-        if field.__class__ == fields.AutoField:
             continue
 
         if field.__class__ == fields.CharField:
             __add_char_value_for(field, instance, arguments)
 
-    for key, value in arguments.iteritems():
+    if instance:
-        setattr(instance, key, value)
+        for key, value in arguments.iteritems():
+            setattr(instance, key, value)
 
-    instance.save()
+        instance.save()
-    return instance
+        return instance
+
+    return topic.model.objects.create(**arguments)
 
 def __add_char_value_for(field, instance, arguments):
     value = "monty python"

vows/model_vows.py

@@ -26,4 +26,9 @@ class ModelVows(Vows.Context):
         def should_be_cruddable_when_model_only_has_a_string(self, topic):
             expect(topic).to_be_cruddable()
 
+        def should_be_cruddable_when_string_passed(self, topic):
+            expect(topic).to_be_cruddable({
+                'name': 'something'
+            })
+