Make sure registerMatchers() works if defined after a spec. (Closes k…

…iwi-bdd#64)
tonklon · Jan 23, 2012 · 28fc8f8 · 28fc8f8
1 parent 98e9b92
commit 28fc8f8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/Examples/SimpleSpec.m b/Examples/SimpleSpec.m
@@ -6,8 +6,41 @@
 
 #import "Kiwi.h"
 
+@interface ABCDummyMatcher : KWMatcher
+- (void)justWork;
+@end
+
+@implementation ABCDummyMatcher
+
++ (NSArray *)matcherStrings {
+  return [NSArray arrayWithObject:@"justWork"];
+}
+
+- (void)justWork {};
+
+- (BOOL)evaluate
+{
+  return YES;
+}
+
+@end
+
 SPEC_BEGIN(SimpleSpec)
 
+describe(@"anything", ^{
+
+  it(@"allows matchers to be registered after the first spec", ^{
+    [[@"this" should] equal:@"this"];
+  });
+
+  registerMatchers(@"ABC");
+
+  it(@"can work with a custom registered matcher", ^{
+    [[@"anything" should] justWork];
+  });
+
+});
+
 describe(@"stack", ^{
     __block NSMutableArray *arr = nil;
 

diff --git a/Kiwi.xcodeproj/project.pbxproj b/Kiwi.xcodeproj/project.pbxproj
@@ -1342,7 +1342,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1365,7 +1365,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
+				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;

diff --git a/Kiwi/KWContextNode.m b/Kiwi/KWContextNode.m
@@ -105,8 +105,9 @@ - (void)performExample:(KWExample *)example withBlock:(void (^)(void))exampleBlo
 
     void (^outerExampleBlock)(void) = ^{
         @try {
+            [self.registerMatchersNode acceptExampleNodeVisitor:example];
+
             if (performedExampleCount == 0) {
-                [self.registerMatchersNode acceptExampleNodeVisitor:example];
                 [self.beforeAllNode acceptExampleNodeVisitor:example];
             }
 

diff --git a/Kiwi/KWExample.m b/Kiwi/KWExample.m
@@ -228,7 +228,7 @@ - (void)visitItNode:(KWItNode *)aNode {
 - (void)visitPendingNode:(KWPendingNode *)aNode {
   if (aNode != exampleNode)
     return;
-  
+
   [self reportResultForExampleNodeWithLabel:@"PENDING"];
 }