Merge remote-tracking branch 'upstream/master' into pr-document-modify

2014-11-02 17:24:51 +03:00
parent 5d2ca6493d c4c7ab7888
commit bc9aff8c60
11 changed files with 44 additions and 7 deletions
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -1858,7 +1858,7 @@ class InstanceTest(unittest.TestCase):
        self.assertEqual(Bar.objects.count(), 1)  # No effect on the BlogPost
        self.assertEqual(Bar.objects.get().foo, None)

-    def test_invalid_reverse_delete_rules_raise_errors(self):
+    def test_invalid_reverse_delete_rule_raise_errors(self):

        def throw_invalid_document_error():
            class Blog(Document):