Skip to content

Google provider unittests #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 5, 2016
Merged

Google provider unittests #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b8d48a6
add GoogleAuthUI unit tests
yramanchuk Oct 4, 2016
8b3de1f
change project format to open step
yramanchuk Oct 4, 2016
8661a92
Merge commit 'c9ed7efac89b51a0c88a28947288eb01f5691687' into google-p…
yramanchuk Oct 4, 2016
cc600fe
fix duplicate class imports in unit tests
yramanchuk Oct 5, 2016
088e56e
add Google provider sign out unit test
yramanchuk Oct 5, 2016
9da4dbf
fix travis test phase
yramanchuk Oct 5, 2016
13abbb8
split travis build and test phases
yramanchuk Oct 5, 2016
83ecb08
fix travis cocoa pods version
yramanchuk Oct 5, 2016
5dcc177
merge with 0.5.6
yramanchuk Oct 5, 2016
d8f7705
clean unit test comments
yramanchuk Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions FirebaseAuthUI/FIRAuthPickerViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
42 changes: 21 additions & 21 deletions FirebaseAuthUI/FIREmailEntryViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
80 changes: 41 additions & 39 deletions FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}];
Expand All @@ -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);
}];
Expand All @@ -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);
}];
Expand All @@ -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);

}

Expand Down
Loading