[Auth] Investigate and fix v11 integration test CI failures (#13254)

Author: paulb777

.github/workflows/auth.yml

@@ -57,6 +57,9 @@ jobs:
   integration-tests:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+    strategy:
+      matrix:
+        scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
 
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
@@ -84,14 +87,14 @@ jobs:
         scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
           FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
     - uses: nick-fields/retry@v3
       with:
         timeout_minutes: 120
         max_attempts: 3
         retry_on: error
         retry_wait_seconds: 120
-        command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS)
+        command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
 
   spm:
     # Don't run on private repo unless it is a PR.

FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj

@@ -478,7 +478,6 @@
 				DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
 				DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */,
 				DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */,
-				DEE261C32C21E9F500EECAC5 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */,
 			);
 			productRefGroup = EAE4CBC224855E3A00245E92 /* Products */;
 			projectDirPath = "";
@@ -988,7 +987,7 @@
 			repositoryURL = "https://github.com/facebook/facebook-ios-sdk";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 14.1.0;
+				minimumVersion = 17.0.2;
 			};
 		};
 		DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */ = {
@@ -999,14 +998,6 @@
 				minimumVersion = 3.4.1;
 			};
 		};
-		DEE261C32C21E9F500EECAC5 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git";
-			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 18.5.1;
-			};
-		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
@@ -1039,11 +1030,6 @@
 			package = DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */;
 			productName = GTMSessionFetcher;
 		};
-		DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = DEE261C32C21E9F500EECAC5 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */;
-			productName = RecaptchaEnterprise;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = EAE4CBB924855E3A00245E92 /* Project object */;

FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift

@@ -229,12 +229,16 @@ class AuthenticationExampleUITests: XCTestCase {
   // MARK: - Private Helpers
 
   private func signOut() {
-    app.tabBars.firstMatch.buttons.element(boundBy: 1).tap()
+    if app.tabBars.firstMatch.buttons.element(boundBy: 1).exists {
+      app.tabBars.firstMatch.buttons.element(boundBy: 1).tap()
+    }
     wait(forElement: app.navigationBars["User"], timeout: 5.0)
     if app.staticTexts["Sign Out"].exists {
       app.staticTexts["Sign Out"].tap()
     }
-    app.tabBars.firstMatch.buttons.element(boundBy: 0).tap()
+    if app.tabBars.firstMatch.buttons.element(boundBy: 0).exists {
+      app.tabBars.firstMatch.buttons.element(boundBy: 0).tap()
+    }
   }
 }
 

scripts/build.sh

@@ -300,26 +300,13 @@ case "$product-$platform-$method" in
         build
     ;;
 
-  Auth-*-xcodebuild)
+  Auth-*-*)
     if check_secrets; then
       RunXcodebuild \
         -project 'FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj' \
-        -scheme "ObjCApiTests" \
+        -scheme "$method" \
         "${xcb_flags[@]}" \
         test
-
-      RunXcodebuild \
-        -project 'FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj' \
-        -scheme "SwiftApiTests" \
-        "${xcb_flags[@]}" \
-        test
-
-      RunXcodebuild \
-        -project 'FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj' \
-        -scheme "AuthenticationExampleUITests" \
-        "${xcb_flags[@]}" \
-        build \
-        test
     fi
     ;;