Fix tests

Author: morganchen12

FirebaseGoogleAuthUI/FirebaseGoogleAuthUI.xcodeproj/project.pbxproj

@@ -775,12 +775,12 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
-					"\"${PODS_ROOT}/GoogleSignIn/Frameworks\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/AppAuth\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
 					"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
+					"\"$(PODS_CONFIGURATION_BUILD_DIR)/GoogleSignIn\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -830,12 +830,12 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"",
-					"\"${PODS_ROOT}/GoogleSignIn/Frameworks\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/AppAuth\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"",
 					"\"$(PODS_CONFIGURATION_BUILD_DIR)/FirebaseAuthUI\"",
+					"\"$(PODS_CONFIGURATION_BUILD_DIR)/GoogleSignIn\"",
 				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",

FirebaseGoogleAuthUI/FirebaseGoogleAuthUITests/FirebaseGoogleAuthUITests.m

@@ -23,7 +23,12 @@
 #import "FUIGoogleAuth.h"
 
 @interface FUIGoogleAuth (Testing)
-- (GIDSignIn *)configuredGoogleSignIn;
+- (NSString *)clientID;
+- (GIDSignIn *)googleSignIn;
+- (void)handleSignInWithUser:(GIDGoogleUser *)user
+                       error:(NSError *)error
+    presentingViewController:(UIViewController *)presentingViewController
+                    callback:(FUIAuthProviderSignInCompletionBlock)callback;
 @end
 
 @interface FirebaseGoogleAuthUITests : XCTestCase
@@ -48,6 +53,7 @@ - (void)setUp {
   FIRAuth *auth = [FIRAuth auth];
   self.authUI = [FUIAuth authUIWithAuth:auth];
   self.mockProvider =  OCMPartialMock([[FUIGoogleAuth alloc] initWithAuthUI:self.authUI]);
+  OCMStub([_mockProvider clientID]).andReturn(@"clientID");
 }
 
 - (void)tearDown {
@@ -82,7 +88,7 @@ - (void)testUseEmulatorCreatesOAuthProvider {
   OCMVerify([self.mockOAuthProvider providerWithProviderID:@"google.com"]);
 }
 
-- (void)testSuccessfullLogin {
+- (void)testSuccessfulLogin {
   NSString *testIdToken = @"idToken";
   NSString *testAccessToken = @"accessToken";
 
@@ -99,11 +105,16 @@ - (void)testSuccessfullLogin {
   OCMExpect([mockGoogleUser authentication]).andReturn(mockAuthentication);
   OCMExpect([mockAuthentication idToken]).andReturn(testIdToken);
 
-  OCMExpect([_mockProvider configuredGoogleSignIn]).andReturn(mockSignIn);
+  OCMExpect([_mockProvider googleSignIn]).andReturn(mockSignIn);
 
-  //forward call to signIn delegate
-  OCMExpect([mockSignIn signIn]).andDo(^(NSInvocation *invocation) {
-    [mockSignInDelegate signIn:mockSignIn didSignInForUser:mockGoogleUser withError:nil];
+  // forward call to signIn delegate
+  OCMExpect([mockSignIn signInWithConfiguration:[OCMArg any]
+                       presentingViewController:[OCMArg any]
+                                           hint:[OCMArg any]
+                                       callback:[OCMArg any]]).andDo(^(NSInvocation *invocation) {
+    void (^callback)(GIDGoogleUser *, NSError *) = nil;
+    [invocation getArgument:&callback atIndex:5];
+    callback(mockGoogleUser, nil);
   });
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
@@ -147,13 +158,15 @@ - (void)testLegacyInitSuccessfulLogin {
   NSString *testIdToken = @"idToken";
   NSString *testAccessToken = @"accessToken";
 
-  _mockProvider =  OCMPartialMock([[FUIGoogleAuth alloc] init]);
+  _mockProvider = OCMPartialMock([[FUIGoogleAuth alloc] init]);
 
   id mockSignInDelegate = _mockProvider;
   id mockSignIn = OCMClassMock([GIDSignIn class]);
   id mockAuthentication = OCMClassMock([GIDAuthentication class]);
   id mockGoogleUser = OCMClassMock([GIDGoogleUser class]);
 
+  OCMStub([_mockProvider clientID]).andReturn(@"clientID");
+
   // mock accessToken
   OCMExpect([mockGoogleUser authentication]).andReturn(mockAuthentication);
   OCMExpect([mockAuthentication accessToken]).andReturn(testAccessToken);
@@ -162,11 +175,16 @@ - (void)testLegacyInitSuccessfulLogin {
   OCMExpect([mockGoogleUser authentication]).andReturn(mockAuthentication);
   OCMExpect([mockAuthentication idToken]).andReturn(testIdToken);
 
-  OCMExpect([_mockProvider configuredGoogleSignIn]).andReturn(mockSignIn);
+  OCMExpect([_mockProvider googleSignIn]).andReturn(mockSignIn);
 
-  //forward call to signIn delegate
-  OCMExpect([mockSignIn signIn]).andDo(^(NSInvocation *invocation) {
-    [mockSignInDelegate signIn:mockSignIn didSignInForUser:mockGoogleUser withError:nil];
+  // forward call to signIn delegate
+  OCMExpect([mockSignIn signInWithConfiguration:[OCMArg any]
+                       presentingViewController:[OCMArg any]
+                                           hint:[OCMArg any]
+                                       callback:[OCMArg any]]).andDo(^(NSInvocation *invocation) {
+    void (^callback)(GIDGoogleUser *, NSError *) = nil;
+    [invocation getArgument:&callback atIndex:5];
+    callback(mockGoogleUser, nil);
   });
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
@@ -222,11 +240,17 @@ - (void)testErrorLogin {
   OCMStub([mockGoogleUser authentication]).andReturn(mockAuthentication);
   OCMStub([mockAuthentication idToken]).andReturn(testIdToken);
 
-  OCMExpect([_mockProvider configuredGoogleSignIn]).andReturn(mockSignIn);
+  OCMExpect([_mockProvider googleSignIn]).andReturn(mockSignIn);
   NSError *signInError = [NSError errorWithDomain:@"sign in domain" code:kGIDSignInErrorCodeUnknown userInfo:@{}];
 
-  OCMExpect([mockSignIn signIn]).andDo(^(NSInvocation *invocation) {
-    [mockSignInDelegate signIn:mockSignIn didSignInForUser:mockGoogleUser withError:signInError];
+  // forward call to signIn delegate
+  OCMExpect([mockSignIn signInWithConfiguration:[OCMArg any]
+                       presentingViewController:[OCMArg any]
+                                           hint:[OCMArg any]
+                                       callback:[OCMArg any]]).andDo(^(NSInvocation *invocation) {
+    void (^callback)(GIDGoogleUser *, NSError *) = nil;
+    [invocation getArgument:&callback atIndex:5];
+    callback(mockGoogleUser, signInError);
   });
 
 
@@ -275,11 +299,17 @@ - (void)testCancelLogin {
   OCMStub([mockGoogleUser authentication]).andReturn(mockAuthentication);
   OCMStub([mockAuthentication idToken]).andReturn(testIdToken);
 
-  OCMExpect([_mockProvider configuredGoogleSignIn]).andReturn(mockSignIn);
+  OCMExpect([_mockProvider googleSignIn]).andReturn(mockSignIn);
   NSError *signInError = [NSError errorWithDomain:@"sign in domain" code:kGIDSignInErrorCodeCanceled userInfo:@{}];
 
-  OCMExpect([mockSignIn signIn]).andDo(^(NSInvocation *invocation) {
-    [mockSignInDelegate signIn:mockSignIn didSignInForUser:mockGoogleUser withError:signInError];
+  // forward call to signIn delegate
+  OCMExpect([mockSignIn signInWithConfiguration:[OCMArg any]
+                       presentingViewController:[OCMArg any]
+                                           hint:[OCMArg any]
+                                       callback:[OCMArg any]]).andDo(^(NSInvocation *invocation) {
+    void (^callback)(GIDGoogleUser *, NSError *) = nil;
+    [invocation getArgument:&callback atIndex:5];
+    callback(mockGoogleUser, signInError);
   });
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
@@ -313,7 +343,7 @@ - (void)testCancelLogin {
 
 - (void)testSignOut {
   id mockSignIn = OCMClassMock([GIDSignIn class]);
-  OCMExpect([_mockProvider configuredGoogleSignIn]).andReturn(mockSignIn);
+  OCMExpect([_mockProvider googleSignIn]).andReturn(mockSignIn);
   OCMExpect([mockSignIn signOut]);
 
   [_mockProvider signOut];
@@ -324,7 +354,7 @@ - (void)testSignOut {
 
 - (void)testUseEmulatorUsesOAuthProvider {
   [self.authUI useEmulatorWithHost:@"host" port:12345];
-  self.mockProvider =  OCMPartialMock([[FUIGoogleAuth alloc] initWithAuthUI:self.authUI]);
+  self.mockProvider = OCMPartialMock([[FUIGoogleAuth alloc] initWithAuthUI:self.authUI]);
 
   [self.mockProvider signInWithDefaultValue:nil
                presentingViewController:nil
@@ -334,7 +364,7 @@ - (void)testUseEmulatorUsesOAuthProvider {
                                           NSDictionary *_Nullable userInfo) {}];
 
   OCMVerify([self.mockOAuthProvider getCredentialWithUIDelegate:nil completion:OCMOCK_ANY]);
-  OCMVerify(never(), [self.mockProvider configuredGoogleSignIn]);
+  OCMVerify(never(), [self.mockProvider googleSignIn]);
 }
 
 

FirebaseGoogleAuthUI/Sources/FUIGoogleAuth.m

@@ -96,6 +96,13 @@ - (instancetype)initWithScopes:(NSArray *)scopes {
 }
 #pragma clang diagnostic pop
 
+- (GIDSignIn *)googleSignIn {
+  return [GIDSignIn sharedInstance];
+}
+
+- (NSString *)clientID {
+  return self.authUI.auth.app.options.clientID;
+}
 
 #pragma mark - FUIAuthProvider
 
@@ -107,14 +114,14 @@ - (nullable NSString *)accessToken {
   if (self.authUI.isEmulatorEnabled) {
     return nil;
   }
-  return [GIDSignIn sharedInstance].currentUser.authentication.accessToken;
+  return [self googleSignIn].currentUser.authentication.accessToken;
 }
 
 - (nullable NSString *)idToken {
   if (self.authUI.isEmulatorEnabled) {
     return nil;
   }
-  return [GIDSignIn sharedInstance].currentUser.authentication.idToken;
+  return [self googleSignIn].currentUser.authentication.idToken;
 }
 
 - (NSString *)shortName {
@@ -161,8 +168,8 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
     return;
   }
 
-  GIDSignIn *signIn = [GIDSignIn sharedInstance];
-  NSString *clientID = self.authUI.auth.app.options.clientID;
+  GIDSignIn *signIn = [self googleSignIn];
+  NSString *clientID = [self clientID];
 
   if (!clientID) {
     [NSException raise:NSInternalInconsistencyException
@@ -178,7 +185,7 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
                              _Nullable FIRAuthResultCallback result,
                              NSDictionary *_Nullable userInfo) {
     if (completion) {
-      completion(credential, error, result, nil);
+      completion(credential, error, result, userInfo);
     }
   };
 
@@ -225,7 +232,7 @@ - (void)signInWithOAuthProvider:(FIROAuthProvider *)oauthProvider
 
 - (void)requestScopesWithPresentingViewController:(UIViewController *)presentingViewController
                                        completion:(FUIAuthProviderSignInCompletionBlock)completion {
-  GIDSignIn *signIn = [GIDSignIn sharedInstance];
+  GIDSignIn *signIn = [self googleSignIn];
   [signIn addScopes:self.scopes presentingViewController:presentingViewController
            callback:^(GIDGoogleUser *user, NSError *error) {
     [self handleSignInWithUser:user
@@ -246,15 +253,15 @@ - (void)signOut {
   if (self.authUI.isEmulatorEnabled) {
     return;
   }
-  GIDSignIn *signIn = [GIDSignIn sharedInstance];
+  GIDSignIn *signIn = [self googleSignIn];
   [signIn signOut];
 }
 
 - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(NSString *)sourceApplication {
   if (self.authUI.isEmulatorEnabled) {
     return NO;
   }
-  GIDSignIn *signIn = [GIDSignIn sharedInstance];
+  GIDSignIn *signIn = [self googleSignIn];
   return [signIn handleURL:URL];
 }