- upgrade

Example/Podfile.lock

@@ -23,9 +23,10 @@ PODS:
   - CocoaSecurity (1.2.4)
   - CodFis-Helper (0.1.3)
   - Expecta (1.0.5)
-  - Expecta+Snapshots (2.0.0):
+  - Expecta+Snapshots (3.0.0):
     - Expecta (~> 1.0)
-    - FBSnapshotTestCase/Core (~> 2.0.3)
+    - FBSnapshotTestCase/Core (~> 2.0)
+    - Specta (~> 1.0)
   - FBSDKCoreKit (4.10.1):
     - Bolts (~> 1.5)
   - FBSDKLoginKit (4.10.1):
@@ -84,7 +85,7 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   PNObject:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
   AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93
@@ -92,7 +93,7 @@ SPEC CHECKSUMS:
   CocoaSecurity: d288a6f87e0f363823d2cb83e753814a6944f71a
   CodFis-Helper: 28be4c74d7202542459d72354f59b1215871de87
   Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
-  Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba
+  Expecta+Snapshots: c343f410c7a6392f3e22e78f94c44b6c0749a516
   FBSDKCoreKit: d2aaed5e9ab7d8d6301c533376a1fbff1cf3deb5
   FBSDKLoginKit: 699ff169080e3072de4b9b0faca90bf23dc36deb
   FBSDKShareKit: 2fd887cce0056bdda91f99b2021d724a4fed8e88

Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.h

@@ -1,11 +1,3 @@
-//
-//  EXPMatchers+FBSnapshotTest.h
-//  Artsy
-//
-//  Created by Daniel Doubrovkine on 1/14/14.
-//  Copyright (c) 2014 Artsy Inc. All rights reserved.
-//
-
 #import <Expecta/Expecta.h>
 #import "ExpectaObject+FBSnapshotTest.h"
 

Example/Pods/Expecta+Snapshots/EXPMatchers+FBSnapshotTest.m

@@ -1,11 +1,3 @@
-//
-//  EXPMatchers+FBSnapshotTest.h
-//  Artsy
-//
-//  Created by Daniel Doubrovkine on 1/14/14.
-//  Copyright (c) 2014 Artsy Inc. All rights reserved.
-//
-
 #import "EXPMatchers+FBSnapshotTest.h"
 #import <Expecta/EXPMatcherHelpers.h>
 #import <FBSnapshotTestCase/FBSnapshotTestController.h>
@@ -102,11 +94,6 @@ void setGlobalReferenceImageDir(char *reference) {
 @end
 
 
-
-// If you're bringing in Speca via CocoaPods
-// use the test path to get the test's image file URL
-
-#if __has_include(<Specta/Specta.h>)
 #import <Specta/Specta.h>
 #import <Specta/SpectaUtility.h>
 #import <Specta/SPTExample.h>
@@ -130,6 +117,11 @@ NSString *sanitizedTestPath(){
 EXPMatcherImplementationBegin(haveValidSnapshot, (void)){
     __block NSError *error = nil;
 
+    prerequisite(^BOOL{
+        return actual;
+    });
+
+
     match(^BOOL{
         NSString *referenceImageDir = [self _getDefaultReferenceDirectory];
         NSString *name = sanitizedTestPath();
@@ -144,6 +136,10 @@ EXPMatcherImplementationBegin(haveValidSnapshot, (void)){
     });
 
     failureMessageForTo(^NSString *{
+        if (!actual) {
+            return [EXPExpectFBSnapshotTest combinedError:@"Nil was passed into haveValidSnapshot." test:sanitizedTestPath() error:nil];
+        }
+
         return [EXPExpectFBSnapshotTest combinedError:@"expected a matching snapshot in" test:sanitizedTestPath() error:error];
     });
 
@@ -159,7 +155,7 @@ EXPMatcherImplementationBegin(recordSnapshot, (void)) {
     BOOL actualIsViewLayerOrViewController = ([actual isKindOfClass:UIView.class] || [actual isKindOfClass:CALayer.class] || [actual isKindOfClass:UIViewController.class]);
 
     prerequisite(^BOOL{
-        return actualIsViewLayerOrViewController;
+        return actual && actualIsViewLayerOrViewController;
     });
 
     match(^BOOL{
@@ -178,6 +174,10 @@ EXPMatcherImplementationBegin(recordSnapshot, (void)) {
     });
 
     failureMessageForTo(^NSString *{
+        if (!actual) {
+            return [EXPExpectFBSnapshotTest combinedError:@"Nil was passed into recordSnapshot." test:sanitizedTestPath() error:nil];
+        }
+
         if (!actualIsViewLayerOrViewController) {
             return [EXPExpectFBSnapshotTest combinedError:@"Expected a View, Layer or View Controller." test:sanitizedTestPath() error:nil];
         }
@@ -198,54 +198,12 @@ EXPMatcherImplementationBegin(recordSnapshot, (void)) {
 }
 EXPMatcherImplementationEnd
 
-#else
-
-// If you don't have Speca stub the functions
-
-EXPMatcherImplementationBegin(haveValidSnapshot, (void)){
-
-    prerequisite(^BOOL{
-        return NO;
-    });
-
-    failureMessageForTo(^NSString *{
-        return @"you need Specta installed via CocoaPods to use haveValidSnapshot, use haveValidSnapshotNamed instead";
-    });
-
-    failureMessageForNotTo(^NSString *{
-        return @"you need Specta installed via CocoaPods to use haveValidSnapshot, use haveValidSnapshotNamed instead";
-    });
-}
-EXPMatcherImplementationEnd
-
-
-EXPMatcherImplementationBegin(recordSnapshot, (void)) {
-    
-    prerequisite(^BOOL{
-        return NO;
-    });
-
-    failureMessageForTo(^NSString *{
-        return @"you need Specta installed via CocoaPods to use recordSnapshot, use recordSnapshotNamed instead";
-    });
-
-    failureMessageForNotTo(^NSString *{
-        return @"you need Specta installed via CocoaPods to use recordSnapshot, use recordSnapshotNamed instead";
-    });
-}
-EXPMatcherImplementationEnd
-
-
-#endif
-
-
-
 EXPMatcherImplementationBegin(haveValidSnapshotNamed, (NSString *snapshot)){
     BOOL snapshotIsNil = (snapshot == nil);
     __block NSError *error = nil;
 
     prerequisite(^BOOL{
-        return !(snapshotIsNil);
+        return actual && !(snapshotIsNil);
     });
 
     match(^BOOL{
@@ -260,6 +218,10 @@ EXPMatcherImplementationBegin(haveValidSnapshotNamed, (NSString *snapshot)){
     });
 
     failureMessageForTo(^NSString *{
+        if (!actual) {
+            return [EXPExpectFBSnapshotTest combinedError:@"Nil was passed into haveValidSnapshotNamed." test:sanitizedTestPath() error:nil];
+        }
+
         return [EXPExpectFBSnapshotTest combinedError:@"expected a matching snapshot named" test:snapshot error:error];
 
     });
@@ -295,6 +257,9 @@ EXPMatcherImplementationBegin(recordSnapshotNamed, (NSString *snapshot)) {
     });
 
     failureMessageForTo(^NSString *{
+        if (!actual) {
+            return [EXPExpectFBSnapshotTest combinedError:@"Nil was passed into recordSnapshotNamed." test:sanitizedTestPath() error:nil];
+        }
         if (!actualIsViewLayerOrViewController) {
             return [EXPExpectFBSnapshotTest combinedError:@"Expected a View, Layer or View Controller." test:snapshot error:nil];
         }

Example/Pods/Manifest.lock

@@ -23,9 +23,10 @@ PODS:
   - CocoaSecurity (1.2.4)
   - CodFis-Helper (0.1.3)
   - Expecta (1.0.5)
-  - Expecta+Snapshots (2.0.0):
+  - Expecta+Snapshots (3.0.0):
     - Expecta (~> 1.0)
-    - FBSnapshotTestCase/Core (~> 2.0.3)
+    - FBSnapshotTestCase/Core (~> 2.0)
+    - Specta (~> 1.0)
   - FBSDKCoreKit (4.10.1):
     - Bolts (~> 1.5)
   - FBSDKLoginKit (4.10.1):
@@ -84,7 +85,7 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   PNObject:
-    :path: "../"
+    :path: ../
 
 SPEC CHECKSUMS:
   AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93
@@ -92,7 +93,7 @@ SPEC CHECKSUMS:
   CocoaSecurity: d288a6f87e0f363823d2cb83e753814a6944f71a
   CodFis-Helper: 28be4c74d7202542459d72354f59b1215871de87
   Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
-  Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba
+  Expecta+Snapshots: c343f410c7a6392f3e22e78f94c44b6c0749a516
   FBSDKCoreKit: d2aaed5e9ab7d8d6301c533376a1fbff1cf3deb5
   FBSDKLoginKit: 699ff169080e3072de4b9b0faca90bf23dc36deb
   FBSDKShareKit: 2fd887cce0056bdda91f99b2021d724a4fed8e88

Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/PNObject.xcscheme

@@ -14,7 +14,7 @@
             buildForArchiving = "YES">
             <BuildableReference
                BuildableIdentifier = 'primary'
-               BlueprintIdentifier = '97690789A9825EB1AAD67920'
+               BlueprintIdentifier = '6AC71F3B739E88734465A959'
                BlueprintName = 'PNObject'
                ReferencedContainer = 'container:Pods.xcodeproj'
                BuildableName = 'PNObject.framework'>

Example/Pods/Target Support Files/Expecta+Snapshots/Info.plist

@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>2.0.0</string>
+  <string>3.0.0</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>