Merge pull request #184 from dchohfi/master

Making respondTo matcher also checks if instance of classes also respondsToSelector:
specta · Jun 24, 2016 · 7c048e9 · 7c048e9
2 parents b8b75c8 + c26c455
commit 7c048e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/Expecta/Matchers/EXPMatchers+respondTo.m b/Expecta/Matchers/EXPMatchers+respondTo.m
@@ -4,12 +4,16 @@
 EXPMatcherImplementationBegin(respondTo, (SEL expected)) {
   BOOL actualIsNil = (actual == nil);
   BOOL expectedIsNull = (expected == NULL);
-
+    
   prerequisite (^BOOL {
     return !(actualIsNil || expectedIsNull);
   });
 
   match(^BOOL {
+    if ([actual respondsToSelector:@selector(instancesRespondToSelector:)] &&
+        [actual instancesRespondToSelector:expected]) {
+      return YES;
+    }
     return [actual respondsToSelector:expected];
   });
 

diff --git a/Tests/Helpers/Fixtures.h b/Tests/Helpers/Fixtures.h
@@ -10,4 +10,5 @@
 
 @interface Baz : NSObject <Protocol>
 + (void)bazClassMethod;
+- (void)bazInstanceMethod;
 @end
diff --git a/Tests/Helpers/Fixtures.m b/Tests/Helpers/Fixtures.m
@@ -8,4 +8,5 @@ @implementation Bar; @end
 
 @implementation Baz
 + (void)bazClassMethod {}
+- (void)bazInstanceMethod {}
 @end
diff --git a/Tests/Matchers/EXPMatchers+respondToTest.m b/Tests/Matchers/EXPMatchers+respondToTest.m
@@ -17,6 +17,7 @@ - (void)setUp {
 - (void)test_respondTo {
   assertPass(test_expect(foo).respondTo(@selector(fooMethod)));
   assertPass(test_expect([Baz class]).respondTo(@selector(bazClassMethod)));
+  assertPass(test_expect([Baz class]).respondTo(@selector(bazInstanceMethod)));
 
   assertFail(test_expect(baz).respondTo(@selector(fooMethod)), ([NSString stringWithFormat:@"expected: <Baz: %p> to respond to fooMethod", baz]));
   assertFail(test_expect([Foo class]).respondTo(@selector(bazClassMethod)), ([NSString stringWithFormat:@"expected: Foo to respond to bazClassMethod"]));
@@ -28,6 +29,7 @@ - (void)test_respondTo {
 - (void)test_toNot_respondTo {
   assertPass(test_expect(baz).notTo.respondTo(@selector(fooMethod)));
   assertPass(test_expect([Foo class]).notTo.respondTo(@selector(bazClassMethod)));
+  assertPass(test_expect([Foo class]).notTo.respondTo(@selector(bazInstanceMethod)));
 
   assertFail(test_expect(foo).notTo.respondTo(@selector(fooMethod)), ([NSString stringWithFormat:@"expected: <Foo: %p> not to respond to fooMethod", foo]));
   assertFail(test_expect([Baz class]).notTo.respondTo(@selector(bazClassMethod)), ([NSString stringWithFormat:@"expected: Baz not to respond to bazClassMethod"]));