Skip to content

Commit c387b87

Browse files
morganchen12morganchen12
committed
Fix tests and disable UI tests
1 parent b5f72ed commit c387b87

File tree

21 files changed

+554
-802
lines changed

21 files changed

+554
-802
lines changed

‎Auth/FirebaseAuthUI.xcodeproj/project.pbxproj

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676
8D69E34B21DD4C6D00CFA49B /* FirebaseAuthUI.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E2ED21DD4C6D00CFA49B /* FirebaseAuthUI.strings */; };
7777
8D69E35921DD614000CFA49B /* FUIAuthTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E35721DD614000CFA49B /* FUIAuthTest.m */; };
7878
8D69E35A21DD614000CFA49B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E35821DD614000CFA49B /* GoogleService-Info.plist */; };
79-
AFC1F987A398C97769EEAF49 /* Pods_FirebaseAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C75BC6A95DCB5BB2416555AA /* Pods_FirebaseAuthUITests.framework */; };
80-
F18D76B90280363380AB6A15 /* Pods_FirebaseAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FDBEE30A8FD28AFDAF9FF21 /* Pods_FirebaseAuthUI.framework */; };
8179
/* End PBXBuildFile section */
8280

8381
/* Begin PBXContainerItemProxy section */
@@ -91,8 +89,6 @@
9189
/* End PBXContainerItemProxy section */
9290

9391
/* Begin PBXFileReference section */
94-
4955D61CF2EE16858F92D6FE /* Pods-FirebaseAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUI/Pods-FirebaseAuthUI.release.xcconfig"; sourceTree = "<group>"; };
95-
4FDBEE30A8FD28AFDAF9FF21 /* Pods_FirebaseAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9692
8D69E25921DD4BD000CFA49B /* FirebaseAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
9793
8D69E25C21DD4BD000CFA49B /* FirebaseAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseAuthUI.h; sourceTree = "<group>"; };
9894
8D69E25D21DD4BD000CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -248,18 +244,13 @@
248244
8D69E34121DD4C6D00CFA49B /* en-IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-IN"; path = "en-IN.lproj/FirebaseAuthUI.strings"; sourceTree = "<group>"; };
249245
8D69E35721DD614000CFA49B /* FUIAuthTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIAuthTest.m; sourceTree = "<group>"; };
250246
8D69E35821DD614000CFA49B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
251-
92B78908F9AAE76445327645 /* Pods-FirebaseAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUITests/Pods-FirebaseAuthUITests.release.xcconfig"; sourceTree = "<group>"; };
252-
B4D75A18555E217B6606843B /* Pods-FirebaseAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUI/Pods-FirebaseAuthUI.debug.xcconfig"; sourceTree = "<group>"; };
253-
C75BC6A95DCB5BB2416555AA /* Pods_FirebaseAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
254-
EF35DF8D73A6F8A868E996F9 /* Pods-FirebaseAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUITests/Pods-FirebaseAuthUITests.debug.xcconfig"; sourceTree = "<group>"; };
255247
/* End PBXFileReference section */
256248

257249
/* Begin PBXFrameworksBuildPhase section */
258250
8D69E25621DD4BD000CFA49B /* Frameworks */ = {
259251
isa = PBXFrameworksBuildPhase;
260252
buildActionMask = 2147483647;
261253
files = (
262-
F18D76B90280363380AB6A15 /* Pods_FirebaseAuthUI.framework in Frameworks */,
263254
);
264255
runOnlyForDeploymentPostprocessing = 0;
265256
};
@@ -268,7 +259,6 @@
268259
buildActionMask = 2147483647;
269260
files = (
270261
8D69E26321DD4BD100CFA49B /* FirebaseAuthUI.framework in Frameworks */,
271-
AFC1F987A398C97769EEAF49 /* Pods_FirebaseAuthUITests.framework in Frameworks */,
272262
);
273263
runOnlyForDeploymentPostprocessing = 0;
274264
};
@@ -454,7 +444,6 @@
454444
isa = PBXNativeTarget;
455445
buildConfigurationList = 8D69E26D21DD4BD100CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAuthUI" */;
456446
buildPhases = (
457-
6938849AE21702CA743A7B88 /* [CP] Check Pods Manifest.lock */,
458447
8D69E25421DD4BD000CFA49B /* Headers */,
459448
8D69E25521DD4BD000CFA49B /* Sources */,
460449
8D69E25621DD4BD000CFA49B /* Frameworks */,
@@ -473,7 +462,6 @@
473462
isa = PBXNativeTarget;
474463
buildConfigurationList = 8D69E27021DD4BD100CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAuthUITests" */;
475464
buildPhases = (
476-
98E25422C6710C94D21B18CB /* [CP] Check Pods Manifest.lock */,
477465
8D69E25E21DD4BD100CFA49B /* Sources */,
478466
8D69E25F21DD4BD100CFA49B /* Frameworks */,
479467
8D69E26021DD4BD100CFA49B /* Resources */,
@@ -640,53 +628,6 @@
640628
};
641629
/* End PBXResourcesBuildPhase section */
642630

643-
/* Begin PBXShellScriptBuildPhase section */
644-
6938849AE21702CA743A7B88 /* [CP] Check Pods Manifest.lock */ = {
645-
isa = PBXShellScriptBuildPhase;
646-
buildActionMask = 2147483647;
647-
files = (
648-
);
649-
inputFileListPaths = (
650-
);
651-
inputPaths = (
652-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
653-
"${PODS_ROOT}/Manifest.lock",
654-
);
655-
name = "[CP] Check Pods Manifest.lock";
656-
outputFileListPaths = (
657-
);
658-
outputPaths = (
659-
"$(DERIVED_FILE_DIR)/Pods-FirebaseAuthUI-checkManifestLockResult.txt",
660-
);
661-
runOnlyForDeploymentPostprocessing = 0;
662-
shellPath = /bin/sh;
663-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
664-
showEnvVarsInLog = 0;
665-
};
666-
98E25422C6710C94D21B18CB /* [CP] Check Pods Manifest.lock */ = {
667-
isa = PBXShellScriptBuildPhase;
668-
buildActionMask = 2147483647;
669-
files = (
670-
);
671-
inputFileListPaths = (
672-
);
673-
inputPaths = (
674-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
675-
"${PODS_ROOT}/Manifest.lock",
676-
);
677-
name = "[CP] Check Pods Manifest.lock";
678-
outputFileListPaths = (
679-
);
680-
outputPaths = (
681-
"$(DERIVED_FILE_DIR)/Pods-FirebaseAuthUITests-checkManifestLockResult.txt",
682-
);
683-
runOnlyForDeploymentPostprocessing = 0;
684-
shellPath = /bin/sh;
685-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
686-
showEnvVarsInLog = 0;
687-
};
688-
/* End PBXShellScriptBuildPhase section */
689-
690631
/* Begin PBXSourcesBuildPhase section */
691632
8D69E25521DD4BD000CFA49B /* Sources */ = {
692633
isa = PBXSourcesBuildPhase;
@@ -952,7 +893,6 @@
952893
};
953894
8D69E26E21DD4BD100CFA49B /* Debug */ = {
954895
isa = XCBuildConfiguration;
955-
baseConfigurationReference = B4D75A18555E217B6606843B /* Pods-FirebaseAuthUI.debug.xcconfig */;
956896
buildSettings = {
957897
CODE_SIGN_IDENTITY = "";
958898
CODE_SIGN_STYLE = Automatic;
@@ -976,7 +916,6 @@
976916
};
977917
8D69E26F21DD4BD100CFA49B /* Release */ = {
978918
isa = XCBuildConfiguration;
979-
baseConfigurationReference = 4955D61CF2EE16858F92D6FE /* Pods-FirebaseAuthUI.release.xcconfig */;
980919
buildSettings = {
981920
CODE_SIGN_IDENTITY = "";
982921
CODE_SIGN_STYLE = Automatic;
@@ -1000,7 +939,6 @@
1000939
};
1001940
8D69E27121DD4BD100CFA49B /* Debug */ = {
1002941
isa = XCBuildConfiguration;
1003-
baseConfigurationReference = EF35DF8D73A6F8A868E996F9 /* Pods-FirebaseAuthUITests.debug.xcconfig */;
1004942
buildSettings = {
1005943
CODE_SIGN_STYLE = Automatic;
1006944
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
@@ -1019,7 +957,6 @@
1019957
};
1020958
8D69E27221DD4BD100CFA49B /* Release */ = {
1021959
isa = XCBuildConfiguration;
1022-
baseConfigurationReference = 92B78908F9AAE76445327645 /* Pods-FirebaseAuthUITests.release.xcconfig */;
1023960
buildSettings = {
1024961
CODE_SIGN_STYLE = Automatic;
1025962
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;

‎Auth/FirebaseAuthUI/FUIAuth.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ - (void)signInWithProviderUI:(id<FUIAuthProvider>)providerUI
197197
credential:credential
198198
resultCallback:result];
199199
} else {
200-
[self.auth signInWithCredential:credential
201-
completion:^(FIRAuthDataResult *_Nullable authResult,
202-
NSError *_Nullable error) {
200+
[self.auth signInAndRetrieveDataWithCredential:credential
201+
completion:^(FIRAuthDataResult *_Nullable authResult,
202+
NSError *_Nullable error) {
203203
if (error && error.code == FIRAuthErrorCodeAccountExistsWithDifferentCredential) {
204204
NSString *email = error.userInfo[kErrorUserInfoEmailKey];
205205
[self.emailAuthProvider handleAccountLinkingForEmail:email
@@ -230,9 +230,9 @@ - (void)autoUpgradeAccountWithProviderUI:(id<FUIAuthProvider>)providerUI
230230
credential:(nullable FIRAuthCredential *)credential
231231
resultCallback:(nullable FIRAuthResultCallback)callback {
232232
[self.auth.currentUser
233-
linkWithCredential:credential
234-
completion:^(FIRAuthDataResult *_Nullable authResult,
235-
NSError * _Nullable error) {
233+
linkAndRetrieveDataWithCredential:credential
234+
completion:^(FIRAuthDataResult *_Nullable authResult,
235+
NSError * _Nullable error) {
236236
if (error) {
237237
// Check for "credential in use" conflict error and handle appropriately.
238238
if (error.code == FIRAuthErrorCodeCredentialAlreadyInUse) {
@@ -283,9 +283,9 @@ - (void)autoUpgradeAccountWithProviderUI:(id<FUIAuthProvider>)providerUI
283283
return;
284284
}
285285

286-
[authResult.user linkWithCredential:credential
287-
completion:^(FIRAuthDataResult *authResult,
288-
NSError *linkError) {
286+
[authResult.user linkAndRetrieveDataWithCredential:credential
287+
completion:^(FIRAuthDataResult *authResult,
288+
NSError *linkError) {
289289
if (linkError) {
290290
[self completeSignInWithResult:nil
291291
error:linkError

‎Auth/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ SPEC CHECKSUMS:
3737
GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560
3838
GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
3939

40-
PODFILE CHECKSUM: 4760d151bb4c1b8b0d1cc3a4b90555f042f65db8
40+
PODFILE CHECKSUM: b52e77a8635fdab60813531d42d397d13cda156e
4141

42-
COCOAPODS: 1.6.1
42+
COCOAPODS: 1.7.0

0 commit comments

Comments
 (0)