@@ -1423,57 +1423,53 @@ class Params:
14231423
14241424 def test_chaining_traits_and_related_with_nested_factories (self ):
14251425 class TestRelatedObject :
1426- def __init__ (self , obj = None , one = None , two = None , nested = None ):
1426+ def __init__ (self , obj = None , attr = None , nested = None ):
14271427 obj .related = self
14281428 self .nested = nested
1429- self .one = one
1430- self .two = two
1429+ self .attr = attr
14311430
14321431 class TestNestedObject :
1433- def __init__ (self , one = None , two = None ):
1434- self .one = one
1435- self .two = two
1432+ def __init__ (self , attr = None ):
1433+ self .attr = attr
14361434
14371435 class TestNestedObjectFactory (factory .Factory ):
14381436 class Meta :
14391437 model = TestNestedObject
1440- one = 1
1441- two = 2
1438+ attr = 1
14421439
14431440 class TestRelatedObjectFactory (factory .Factory ):
14441441 class Meta :
14451442 model = TestRelatedObject
1446- one = 1
1447- two = 2
1443+ attr = 1
14481444
1449- nested = factory .SubFactory (TestNestedObjectFactory , one = None , two = None )
1445+ nested = factory .SubFactory (TestNestedObjectFactory , attr = None )
14501446
14511447 class TestObjectFactory (factory .Factory ):
14521448 class Meta :
14531449 model = TestObject
1454- one = 1
1455- two = 2
14561450
14571451 class Params :
14581452 with_related = factory .Trait (
14591453 related_obj = factory .RelatedFactory (
14601454 TestRelatedObjectFactory ,
14611455 factory_related_name = 'obj' ,
1462- nested__one = 1 ,
1456+ nested__attr = 2 ,
14631457 ),
14641458 )
14651459 with_related_nested_override = factory .Trait (
14661460 with_related = True ,
1467- related_obj__nested__two = 2 ,
1461+ related_obj__nested__attr = 3 ,
14681462 )
14691463
14701464 obj = TestObjectFactory .build (with_related_nested_override = True )
1471- self .assertEqual (1 , obj .one )
1472- self .assertEqual (2 , obj .two )
1473- self .assertEqual (1 , obj .related .one )
1474- self .assertEqual (2 , obj .related .two )
1475- self .assertEqual (1 , obj .related .nested .one )
1476- self .assertEqual (2 , obj .related .nested .two )
1465+ self .assertEqual (1 , obj .related .attr )
1466+ self .assertEqual (3 , obj .related .nested .attr )
1467+ obj = TestObjectFactory .build (with_related_nested_override = True , related_obj__nested__attr = 4 )
1468+ self .assertEqual (1 , obj .related .attr )
1469+ self .assertEqual (4 , obj .related .nested .attr )
1470+ obj = TestObjectFactory .build (with_related_nested_override = False )
1471+ with self .assertRaises (AttributeError ):
1472+ obj .related
14771473
14781474 def test_prevent_cyclic_traits (self ):
14791475
0 commit comments