Skip to content

Commit a6115f9

Browse files
resolve merge conflict when rce-main rebase from main (#14149)
1 parent 73a7ede commit a6115f9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

FirebaseAuth/Tests/Unit/GetRecaptchaConfigTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class GetRecaptchaConfigTests: RPCBaseTests {
4949
rpcIssuer.recaptchaSiteKey = kTestRecaptchaKey
5050
let enforcementMode = "AUDIT"
5151
rpcIssuer.rceMode = enforcementMode
52-
let response = try await AuthBackend.call(with: request)
52+
let response = try await authBackend.call(with: request)
5353
XCTAssertEqual(response.recaptchaKey, kTestRecaptchaKey)
5454
XCTAssertEqual(
5555
response.enforcementState,
@@ -67,7 +67,7 @@ class GetRecaptchaConfigTests: RPCBaseTests {
6767
let request = GetRecaptchaConfigRequest(requestConfiguration: makeRequestConfiguration())
6868
let enforcementMode = "OFF"
6969
rpcIssuer.rceMode = enforcementMode
70-
let response = try await AuthBackend.call(with: request)
70+
let response = try await authBackend.call(with: request)
7171
XCTAssertEqual(response.recaptchaKey, nil)
7272
XCTAssertEqual(
7373
response.enforcementState,

FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@
818818
}
819819
}
820820

821-
class FakeAuthRecaptchaVerifier: AuthRecaptchaVerifier {
821+
class FakeAuthRecaptchaVerifier: AuthRecaptchaVerifier, @unchecked Sendable {
822822
var captchaResponse: String
823823
var error: Error?
824824
init(captchaResponse: String? = nil, error: Error? = nil) {

0 commit comments

Comments
 (0)