use instanceIDForTest for instance init in unit tests (#2239)

* use instanceIDForTest for instance init in unit tests
* looks like realInstanceID is not needed
* Get InstanceID from SpecsStaging to fix tests

Author: charlotteliang

Example/Messaging/Tests/FIRMessagingTest.m

@@ -26,6 +26,12 @@
 
 extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
 
+@interface FIRInstanceID (ExposedForTest)
+
++ (FIRInstanceID *)instanceIDForTests;
+
+@end
+
 @interface FIRMessaging ()
 + (FIRMessaging *)messagingForTests;
 
@@ -45,7 +51,6 @@ @interface FIRMessagingTest : XCTestCase
 @property(nonatomic, readonly, strong) FIRMessaging *messaging;
 @property(nonatomic, readwrite, strong) id mockMessaging;
 @property(nonatomic, readwrite, strong) id mockInstanceID;
-@property(nonatomic, readwrite, strong) id realInstanceID;
 @property(nonatomic, readwrite, strong) id mockFirebaseApp;
 
 @end
@@ -55,19 +60,17 @@ @implementation FIRMessagingTest
 - (void)setUp {
   [super setUp];
   _messaging = [FIRMessaging messagingForTests];
+  _messaging.instanceID = [FIRInstanceID instanceIDForTests];
   _mockFirebaseApp = OCMClassMock([FIRApp class]);
    OCMStub([_mockFirebaseApp defaultApp]).andReturn(_mockFirebaseApp);
   _mockInstanceID = OCMPartialMock(self.messaging.instanceID);
-  _realInstanceID = self.messaging.instanceID;
-  self.messaging.instanceID = self.mockInstanceID;
   [[NSUserDefaults standardUserDefaults]
       removePersistentDomainForName:[NSBundle mainBundle].bundleIdentifier];
 }
 
 - (void)tearDown {
   self.messaging.shouldEstablishDirectChannel = NO;
   self.messaging.defaultFcmToken = nil;
-  self.messaging.instanceID = self.realInstanceID;
   self.messaging.apnsTokenData = nil;
   [_mockMessaging stopMocking];
   [_mockInstanceID stopMocking];

Example/Podfile

@@ -1,7 +1,11 @@
-# Uncomment the next two lines for pre-release testing
+# Uncomment the next two lines for pre-release testing on internal repo
 #source 'sso://cpdc-internal/firebase'
 #source 'https://github.com/CocoaPods/Specs.git'
 
+# Uncomment the next two lines for pre-release testing on public repo
+source 'https://github.com/Firebase/SpecsStaging.git'
+source 'https://github.com/CocoaPods/Specs.git'
+
 use_frameworks!
 
 pod 'FirebaseAnalyticsInterop', :path => '../'

FirebaseMessaging.podspec

@@ -39,7 +39,7 @@ device, and it is completely free.
   s.framework = 'SystemConfiguration'
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.1'
   s.dependency 'FirebaseCore', '~> 5.1'
-  s.dependency 'FirebaseInstanceID', '~> 3.0'
+  s.dependency 'FirebaseInstanceID', '~> 3.4'
   s.dependency 'GoogleUtilities/Reachability', '~> 5.2'
   s.dependency 'GoogleUtilities/Environment', '~> 5.2'
   s.dependency 'Protobuf', '~> 3.1'

scripts/pod_lib_lint.sh

@@ -37,7 +37,7 @@ fi
 # or Core APIs change. GoogleUtilities.podspec and FirebaseCore.podspec should be
 # manually pushed to a temporary Specs repo. See
 # https://guides.cocoapods.org/making/private-cocoapods.
-ALT_SOURCES="--sources=https://github.com/paulb777/Specs.git,https://github.com/CocoaPods/Specs.git"
+ALT_SOURCES="--sources=https://github.com/Firebase/SpecsStaging.git,https://github.com/CocoaPods/Specs.git"
 
 podspec="$1"
 if [[ $# -gt 1 ]]; then