Fixed crash when passing nil arguments to definition through another …

…definition (#214)
appsquickly · May 14, 2014 · d08c594 · d08c594
1 parent 1d5b7a7
commit d08c594
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Source/Factory/Block/TyphoonRuntimeArguments.m b/Source/Factory/Block/TyphoonRuntimeArguments.m
@@ -122,6 +122,9 @@ - (id)argumentValueAtIndex:(NSUInteger)index
 
 - (void)replaceArgumentAtIndex:(NSUInteger)index withArgument:(id)argument
 {
+    if (!argument) {
+        argument = [TyphoonRuntimeNullArgument new];
+    }
     [_arguments replaceObjectAtIndex:index withObject:argument];
     _needRehash = YES;
 }

diff --git a/Tests/Definition/Properties/RuntimePropertiesInjectionsTests.m b/Tests/Definition/Properties/RuntimePropertiesInjectionsTests.m
@@ -64,6 +64,13 @@ - (void)test_runtime_knight_with_nil
     assertThatInt(knight.damselsRescued, equalToInt(0));
 }
 
+- (void)test_runtime_knight_with_method_arg_nil
+{
+    Knight *knight = [factory knightWithRuntimeDamselsRescued:@(12) runtimeQuestUrl:nil];
+    assertThat([knight.quest imageUrl], equalTo(nil));
+    assertThatInt(knight.damselsRescued, equalToInt(12));
+}
+
 
 - (void)test_predefined_quest
 {