Added 'action' block which is run after all beforeEach and just befor…

…e example (it()). This one allows cleaner testing with less code duplication.
Sependa · Sep 11, 2012 · d5f0a2f · d5f0a2f · robertwijas · Sep 20, 2012
1 parent 423c7c6
commit d5f0a2f
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1 deletion.
diff --git a/Source/CDRExample.m b/Source/CDRExample.m
@@ -57,6 +57,7 @@ - (void)run {
         NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
         @try {
             [parent_ setUp];
+            [parent_ runAction];
             block_();
             self.state = CDRExampleStatePassed;
         } @catch (CDRSpecFailure *x) {

diff --git a/Source/CDRExampleGroup.m b/Source/CDRExampleGroup.m
@@ -8,6 +8,8 @@ - (void)stopObservingExamples;
 @implementation CDRExampleGroup
 
 @synthesize examples = examples_;
+@synthesize action = action_;
+
 
 + (id)groupWithText:(NSString *)text {
     return [[[[self class] alloc] initWithText: text] autorelease];
@@ -29,6 +31,7 @@ - (id)initWithText:(NSString *)text isRoot:(BOOL)isRoot {
 
 - (void)dealloc {
     [afterBlocks_ release];
+    [action_ release];
     [examples_ release];
     [beforeBlocks_ release];
     [super dealloc];
@@ -111,6 +114,14 @@ - (void)setUp {
     }
 }
 
+- (void)runAction
+{
+    [parent_ runAction];
+    if (self.action) {
+        self.action();
+    }
+}
+
 - (void)tearDown {
     for (CDRSpecBlock afterBlock in afterBlocks_) {
         afterBlock();

diff --git a/Source/CDRSpec.m b/Source/CDRSpec.m
@@ -10,6 +10,10 @@ void beforeEach(CDRSpecBlock block) {
     [currentSpec.currentGroup addBefore:block];
 }
 
+void action(CDRSpecBlock block) {
+    [currentSpec.currentGroup setAction:block];
+}
+
 void afterEach(CDRSpecBlock block) {
     [currentSpec.currentGroup addAfter:block];
 }

diff --git a/Source/Headers/CDRExampleGroup.h b/Source/Headers/CDRExampleGroup.h
@@ -4,7 +4,7 @@
     NSMutableArray *beforeBlocks_, *examples_, *afterBlocks_;
     BOOL isRoot_;
 }
-
+@property(nonatomic, copy) CDRSpecBlock action;
 @property (nonatomic, readonly) NSArray *examples;
 
 + (id)groupWithText:(NSString *)text;

diff --git a/Source/Headers/CDRExampleParent.h b/Source/Headers/CDRExampleParent.h
@@ -5,6 +5,7 @@
 - (BOOL)shouldRun;
 
 - (void)setUp;
+- (void)runAction;
 - (void)tearDown;
 
 @optional

diff --git a/Source/Headers/CDRSpec.h b/Source/Headers/CDRSpec.h
@@ -13,6 +13,7 @@ extern const CDRSpecBlock PENDING;
 extern "C" {
 #endif
 void beforeEach(CDRSpecBlock);
+void action(CDRSpecBlock block);
 void afterEach(CDRSpecBlock);
 
 CDRExampleGroup * describe(NSString *, CDRSpecBlock);

diff --git a/Source/SpecHelper.m b/Source/SpecHelper.m
@@ -45,6 +45,9 @@ - (BOOL)shouldRun {
     return NO;
 }
 
+- (void)runAction
+{}
+
 - (void)setUp {
     if ([self respondsToSelector:@selector(beforeEach)]) {
         NSLog(@"********************************************************************************");