Integrate Latest @ 201100220

jonsimantov · jonsimantov · commit e763e4f76d36 · 2018-06-18T19:11:26.000-07:00
Changes to auth/testapp ...
- Expect linking with the same credential to error.

CL: 201100220
diff --git a/auth/testapp/src/common_main.cc b/auth/testapp/src/common_main.cc
@@ -973,7 +973,8 @@ extern "C" int common_main(int argc, const char* argv[]) {
           Future<User*> link_future =
               anonymous_user->LinkWithCredential(user_cred);
           WaitForSignInFuture(link_future, "User::LinkWithCredential() again",
-                              kAuthErrorNone, auth);
+                              ::firebase::auth::kAuthErrorProviderAlreadyLinked,
+                              auth);
         }
 
         // Test User::LinkWithCredential(), linking with bad credential.

Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,8 @@ extern "C" int common_main(int argc, const char* argv[]) {`
`973`	`973`	`Future<User*> link_future =`
`974`	`974`	`anonymous_user->LinkWithCredential(user_cred);`
`975`	`975`	`WaitForSignInFuture(link_future, "User::LinkWithCredential() again",`
`976`		`- kAuthErrorNone, auth);`
	`976`	`+ ::firebase::auth::kAuthErrorProviderAlreadyLinked,`
	`977`	`+ auth);`
`977`	`978`	`}`
`978`	`979`
`979`	`980`	`// Test User::LinkWithCredential(), linking with bad credential.`