Skip to content

resolve merge conflict when rce-main rebase from main #14149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2024
Merged

resolve merge conflict when rce-main rebase from main #14149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d790b9
fix merge conflict
Xiaoshouzi-gh Nov 19, 2024
78c4f79
make FakeAuthRecaptchaVerifier restate inherited sendable
Xiaoshouzi-gh Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FirebaseAuth/Tests/Unit/GetRecaptchaConfigTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class GetRecaptchaConfigTests: RPCBaseTests {
rpcIssuer.recaptchaSiteKey = kTestRecaptchaKey
let enforcementMode = "AUDIT"
rpcIssuer.rceMode = enforcementMode
let response = try await AuthBackend.call(with: request)
let response = try await authBackend.call(with: request)
XCTAssertEqual(response.recaptchaKey, kTestRecaptchaKey)
XCTAssertEqual(
response.enforcementState,
Expand All @@ -67,7 +67,7 @@ class GetRecaptchaConfigTests: RPCBaseTests {
let request = GetRecaptchaConfigRequest(requestConfiguration: makeRequestConfiguration())
let enforcementMode = "OFF"
rpcIssuer.rceMode = enforcementMode
let response = try await AuthBackend.call(with: request)
let response = try await authBackend.call(with: request)
XCTAssertEqual(response.recaptchaKey, nil)
XCTAssertEqual(
response.enforcementState,
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Tests/Unit/PhoneAuthProviderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@
}
}

class FakeAuthRecaptchaVerifier: AuthRecaptchaVerifier {
class FakeAuthRecaptchaVerifier: AuthRecaptchaVerifier, @unchecked Sendable {
Copy link
Member

@ncooke3 ncooke3 Nov 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks okay for now since it's test code. What prompted this to be added though?

Copy link
Contributor Author

@Xiaoshouzi-gh Xiaoshouzi-gh Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI failed for this asking to restate from sendable

var captchaResponse: String
var error: Error?
init(captchaResponse: String? = nil, error: Error? = nil) {
Expand Down
Loading