Fix Catalyst tests for #7050

Author: paulb777

.github/workflows/auth.yml

@@ -67,26 +67,11 @@ jobs:
     # 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'
     runs-on: macOS-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Xcode 12
-      run: sudo xcode-select -s /Applications/Xcode_12.app/Contents/Developer
-    - name: Initialize xcodebuild
-      run: xcodebuild -list
-    - name: iOS Unit Tests
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh AuthUnit iOS spm
-
-  spm-cron:
-    # Don't run on private repo.
-    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macOS-latest
     strategy:
       matrix:
-        target: [tvOS, macOS, catalyst]
+        target: [iOS, tvOS, macOS, catalyst]
     steps:
     - uses: actions/checkout@v2
-    - name: Xcode 12
-      run: sudo xcode-select -s /Applications/Xcode_12.app/Contents/Developer
     - name: Initialize xcodebuild
       run: xcodebuild -list
     - name: Unit Tests

FirebaseAuth/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 7.3.0
+- [fixed] Catalyst browser issue with `verifyPhoneNumber` API. (#7049)
+
 # 7.1.0
 - [fixed] Fixed completion handler issue in `application(_:didReceiveRemoteNotification:fetchCompletionHandler:)` method. (#6863)
 

FirebaseAuth/Tests/Unit/FIRAuthURLPresenterTests.m

@@ -101,17 +101,18 @@ - (void)testFIRAuthURLPresenterUsingDefaultUIDelegate:(BOOL)usesDefaultUIDelegat
         [invocation getArgument:&unretainedArgument atIndex:2];
 
         id presentViewController = unretainedArgument;
-        if (@available(iOS 9.0, *)) {  // SFSafariViewController is available
-          SFSafariViewController *viewController = presentViewController;
-          XCTAssertTrue([viewController isKindOfClass:[SFSafariViewController class]]);
-          XCTAssertEqual(viewController.delegate, presenter);
-        } else {
-          UINavigationController *navigationController = presentViewController;
-          XCTAssertTrue([navigationController isKindOfClass:[UINavigationController class]]);
-          FIRAuthWebViewController *webViewController =
-              navigationController.viewControllers.firstObject;
-          XCTAssertTrue([webViewController isKindOfClass:[FIRAuthWebViewController class]]);
-        }
+#if TARGET_OS_MACCATALYST
+        // SFSafariViewController is not available
+        UINavigationController *navigationController = presentViewController;
+        XCTAssertTrue([navigationController isKindOfClass:[UINavigationController class]]);
+        FIRAuthWebViewController *webViewController =
+            navigationController.viewControllers.firstObject;
+        XCTAssertTrue([webViewController isKindOfClass:[FIRAuthWebViewController class]]);
+#else
+        SFSafariViewController *viewController = presentViewController;
+        XCTAssertTrue([viewController isKindOfClass:[SFSafariViewController class]]);
+        XCTAssertEqual(viewController.delegate, presenter);
+#endif
         [UIPresentationExpectation fulfill];
       });