From e2ef7c96ed74b35b9dec75a7f222b6ffa9214c10 Mon Sep 17 00:00:00 2001
From: Raphaël Barrois <raphael.barrois@polyconseil.fr>
Date: Mon, 23 Jun 2014 11:09:53 +0200
Subject: Fix declaration inheritance.

---
 tests/test_using.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'tests')

diff --git a/tests/test_using.py b/tests/test_using.py
index e20f949..f18df4d 100644
--- a/tests/test_using.py
+++ b/tests/test_using.py
@@ -766,6 +766,37 @@ class UsingFactoryTestCase(unittest.TestCase):
         test_object_alt = TestObjectFactory.build()
         self.assertEqual(None, test_object_alt.three)
 
+    def test_override_inherited(self):
+        """Overriding inherited declarations"""
+        class TestObjectFactory(factory.Factory):
+            class Meta:
+                model = TestObject
+
+            one = 'one'
+
+        class TestObjectFactory2(TestObjectFactory):
+            one = 'two'
+
+        test_object = TestObjectFactory2.build()
+        self.assertEqual('two', test_object.one)
+
+    def test_override_inherited_deep(self):
+        """Overriding inherited declarations"""
+        class TestObjectFactory(factory.Factory):
+            class Meta:
+                model = TestObject
+
+            one = 'one'
+
+        class TestObjectFactory2(TestObjectFactory):
+            one = 'two'
+
+        class TestObjectFactory3(TestObjectFactory2):
+            pass
+
+        test_object = TestObjectFactory3.build()
+        self.assertEqual('two', test_object.one)
+
     def test_inheritance_and_sequences(self):
         """Sequence counters should be kept within an inheritance chain."""
         class TestObjectFactory(factory.Factory):
-- 
cgit v1.2.3