add GoogleAuthUI unit tests

firebase · Oct 4, 2016 · b8d48a6 · b8d48a6
1 parent 0e4105c
commit b8d48a6
Show file tree

Hide file tree

Showing 6 changed files with 332 additions and 124 deletions.
diff --git a/FirebaseAuthUI/FIRAuthPickerViewController.m b/FirebaseAuthUI/FIRAuthPickerViewController.m
@@ -151,22 +151,22 @@ - (void)signInWithProviderUI:(id<FIRAuthProviderUI>)providerUI {
   // Sign out first to make sure sign in starts with a clean state.
   [providerUI signOut];
   [providerUI signInWithEmail:nil
-    presentingViewController:self
-                  completion:^(FIRAuthCredential *_Nullable credential,
-                               NSError *_Nullable error) {
-    if (error) {
-      [self decrementActivity];
-
-      if (error.code == FIRAuthUIErrorCodeUserCancelledSignIn) {
-        // User cancelled sign in, Do nothing.
-        return;
-      }
-
-      [self.navigationController dismissViewControllerAnimated:YES completion:^{
-        [self.authUI invokeResultCallbackWithUser:nil error:error];
-      }];
-      return;
-    }
+     presentingViewController:self
+                   completion:^(FIRAuthCredential *_Nullable credential,
+                                NSError *_Nullable error) {
+                     if (error) {
+                       [self decrementActivity];
+
+                       if (error.code == FIRAuthUIErrorCodeUserCancelledSignIn) {
+                         // User cancelled sign in, Do nothing.
+                         return;
+                       }
+
+                       [self.navigationController dismissViewControllerAnimated:YES completion:^{
+                         [self.authUI invokeResultCallbackWithUser:nil error:error];
+                       }];
+                       return;
+                     }
 
     [self.auth signInWithCredential:credential
                          completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
@@ -231,22 +231,22 @@ - (void)handleAccountLinkingForEmail:(NSString *)email
       // Sign out first to make sure sign in starts with a clean state.
       [bestProvider signOut];
       [bestProvider signInWithEmail:email
-          presentingViewController:self
-                        completion:^(FIRAuthCredential *_Nullable credential,
-                                     NSError *_Nullable error) {
-        if (error) {
-          [self decrementActivity];
-
-          if (error.code == FIRAuthUIErrorCodeUserCancelledSignIn) {
-            // User cancelled sign in, Do nothing.
-            return;
-          }
-
-          [self.navigationController dismissViewControllerAnimated:YES completion:^{
-            [self.authUI invokeResultCallbackWithUser:nil error:error];
-          }];
-          return;
-        }
+           presentingViewController:self
+                         completion:^(FIRAuthCredential *_Nullable credential,
+                                      NSError *_Nullable error) {
+                           if (error) {
+                             [self decrementActivity];
+
+                             if (error.code == FIRAuthUIErrorCodeUserCancelledSignIn) {
+                               // User cancelled sign in, Do nothing.
+                               return;
+                             }
+
+                             [self.navigationController dismissViewControllerAnimated:YES completion:^{
+                               [self.authUI invokeResultCallbackWithUser:nil error:error];
+                             }];
+                             return;
+                           }
 
         [self.auth signInWithCredential:credential completion:^(FIRUser *_Nullable user,
                                                                 NSError *_Nullable error) {

diff --git a/FirebaseAuthUI/FIREmailEntryViewController.m b/FirebaseAuthUI/FIREmailEntryViewController.m
@@ -207,27 +207,27 @@ - (void)signInWithProvider:(id<FIRAuthProviderUI>)provider email:(NSString *)ema
   // Sign out first to make sure sign in starts with a clean state.
   [provider signOut];
   [provider signInWithEmail:email
-      presentingViewController:self
-                    completion:^(FIRAuthCredential *_Nullable credential,
-                                 NSError *_Nullable error) {
-    if (error) {
-      [self decrementActivity];
-
-      [self.navigationController dismissViewControllerAnimated:YES completion:^{
-        [self.authUI invokeResultCallbackWithUser:nil error:error];
-      }];
-      return;
-    }
-
-    [self.auth signInWithCredential:credential
-                         completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
-      [self decrementActivity];
-
-      [self.navigationController dismissViewControllerAnimated:YES completion:^{
-        [self.authUI invokeResultCallbackWithUser:user error:error];
-      }];
-    }];
-  }];
+   presentingViewController:self
+                 completion:^(FIRAuthCredential *_Nullable credential,
+                              NSError *_Nullable error) {
+                   if (error) {
+                     [self decrementActivity];
+
+                     [self.navigationController dismissViewControllerAnimated:YES completion:^{
+                       [self.authUI invokeResultCallbackWithUser:nil error:error];
+                     }];
+                     return;
+                   }
+
+                   [self.auth signInWithCredential:credential
+                                        completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+                                          [self decrementActivity];
+                                          
+                                          [self.navigationController dismissViewControllerAnimated:YES completion:^{
+                                            [self.authUI invokeResultCallbackWithUser:user error:error];
+                                          }];
+                                        }];
+                 }];
 }
 
 @end
diff --git a/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m b/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m
@@ -71,19 +71,19 @@ - (void)testSuccessfullLogin {
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
   [self.provider signInWithEmail:nil
-       presentingViewController:nil
-                     completion:^(FIRAuthCredential * _Nullable credential, NSError * _Nullable error) {
-                       XCTAssertNil(error);
-                       XCTAssertNotNil(credential);
-                       FIRAuthCredential *expectedCredential = [FIRFacebookAuthProvider credentialWithAccessToken:testToken];
-                       XCTAssertEqualObjects(credential.provider, expectedCredential.provider);
-                       XCTAssertNil(self.provider.idToken);
-
-                       //verify that we are using token from server
-                       OCMVerify([mockToken tokenString]);
-
-                       [expectation fulfill];
-   }];
+        presentingViewController:nil
+                      completion:^(FIRAuthCredential * _Nullable credential, NSError * _Nullable error) {
+                        XCTAssertNil(error);
+                        XCTAssertNotNil(credential);
+                        FIRAuthCredential *expectedCredential = [FIRFacebookAuthProvider credentialWithAccessToken:testToken];
+                        XCTAssertEqualObjects(credential.provider, expectedCredential.provider);
+                        XCTAssertNil(self.provider.idToken);
+
+                        //verify that we are using token from server
+                        OCMVerify([mockToken tokenString]);
+
+                        [expectation fulfill];
+                      }];
   [self waitForExpectationsWithTimeout:0.1 handler:^(NSError * _Nullable error) {
     XCTAssertNil(error);
   }];
@@ -107,19 +107,19 @@ - (void)testCancelLogin {
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
   [self.provider signInWithEmail:nil
-       presentingViewController:nil
-                     completion:^(FIRAuthCredential * _Nullable credential,
-                                    NSError * _Nullable error) {
-                       XCTAssertNotNil(error);
-                       XCTAssertEqual(error.code, FIRAuthUIErrorCodeUserCancelledSignIn);
-                       XCTAssertNil(credential);
-                       XCTAssertNil(self.provider.idToken);
-
-                       //verify that we are not using token from server if user canceled request
-                       OCMReject([mockToken tokenString]);
-
-                       [expectation fulfill];
-                     }];
+        presentingViewController:nil
+                      completion:^(FIRAuthCredential * _Nullable credential,
+                                   NSError * _Nullable error) {
+                        XCTAssertNotNil(error);
+                        XCTAssertEqual(error.code, FIRAuthUIErrorCodeUserCancelledSignIn);
+                        XCTAssertNil(credential);
+                        XCTAssertNil(self.provider.idToken);
+
+                        //verify that we are not using token from server if user canceled request
+                        OCMReject([mockToken tokenString]);
+
+                        [expectation fulfill];
+                      }];
   [self waitForExpectationsWithTimeout:0.1 handler:^(NSError * _Nullable error) {
     XCTAssertNil(error);
   }];
@@ -132,15 +132,15 @@ - (void)testErrorLogin {
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
   [self.provider signInWithEmail:nil
-       presentingViewController:nil
-                     completion:^(FIRAuthCredential * _Nullable credential,
-                                    NSError * _Nullable error) {
-                       XCTAssertNotNil(error);
-                       XCTAssertEqual(error.userInfo[NSUnderlyingErrorKey], testError);
-                       XCTAssertNil(credential);
-                       XCTAssertNil(self.provider.idToken);
-                       [expectation fulfill];
-                     }];
+        presentingViewController:nil
+                      completion:^(FIRAuthCredential * _Nullable credential,
+                                   NSError * _Nullable error) {
+                        XCTAssertNotNil(error);
+                        XCTAssertEqual(error.userInfo[NSUnderlyingErrorKey], testError);
+                        XCTAssertNil(credential);
+                        XCTAssertNil(self.provider.idToken);
+                        [expectation fulfill];
+                      }];
   [self waitForExpectationsWithTimeout:0.1 handler:^(NSError * _Nullable error) {
     XCTAssertNil(error);
   }];
@@ -150,19 +150,21 @@ - (void)testSignOut {
 
   // used to make possible initialization of FIRFacebookAuthUI
   id mockProviderClass = OCMClassMock([FIRFacebookAuthUI class]);
-  OCMStub(ClassMethod([mockProviderClass frameworkBundle])).andReturn([NSBundle bundleForClass:[self class]]);
+  OCMExpect(ClassMethod([mockProviderClass frameworkBundle])).andReturn([NSBundle bundleForClass:[self class]]);
 
   id mockProvider = OCMPartialMock([[FIRFacebookAuthUI alloc] init]);
   id mockFacebookManager = OCMClassMock([FBSDKLoginManager class]);
 
   // stub login manager
-  OCMStub(ClassMethod([mockProvider frameworkBundle])).andReturn([NSBundle bundleForClass:[self class]]);
-  OCMStub([mockProvider createLoginManger]).andReturn(mockFacebookManager);
+  OCMExpect(ClassMethod([mockProvider frameworkBundle])).andReturn([NSBundle bundleForClass:[self class]]);
+  OCMExpect([mockProvider createLoginManger]).andReturn(mockFacebookManager);
   [mockProvider configureProvider];
 
+  OCMExpect([mockFacebookManager logOut]);
   [mockProvider signOut];
 
-  OCMVerify([mockFacebookManager logOut]);
+  OCMVerifyAll(mockFacebookManager);
+  OCMVerifyAll(mockProvider);
 
 }