mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 01:20:12 +00:00
Refactor reportUrl to reportURL.
This commit is contained in:
@@ -89,7 +89,7 @@ class BugReportScreenViewModel: BugReportScreenViewModelType, BugReportScreenVie
|
|||||||
switch await bugReportService.submitBugReport(bugReport,
|
switch await bugReportService.submitBugReport(bugReport,
|
||||||
progressListener: progressSubject) {
|
progressListener: progressSubject) {
|
||||||
case .success(let response):
|
case .success(let response):
|
||||||
MXLog.info("Submission uploaded to: \(response.reportUrl)")
|
MXLog.info("Submission uploaded: \(response.reportURL ?? "The server didn't generate a report URL")")
|
||||||
actionsSubject.send(.submitFinished)
|
actionsSubject.send(.submitFinished)
|
||||||
case .failure(let error):
|
case .failure(let error):
|
||||||
MXLog.error("Submission failed: \(error)")
|
MXLog.error("Submission failed: \(error)")
|
||||||
|
|||||||
@@ -137,7 +137,6 @@ class BugReportService: NSObject, BugReportServiceProtocol {
|
|||||||
|
|
||||||
// Parse the JSON data
|
// Parse the JSON data
|
||||||
let decoder = JSONDecoder()
|
let decoder = JSONDecoder()
|
||||||
decoder.keyDecodingStrategy = .convertFromSnakeCase
|
|
||||||
let uploadResponse = try decoder.decode(SubmitBugReportResponse.self, from: data)
|
let uploadResponse = try decoder.decode(SubmitBugReportResponse.self, from: data)
|
||||||
|
|
||||||
lastCrashEventID = nil
|
lastCrashEventID = nil
|
||||||
|
|||||||
@@ -22,7 +22,11 @@ struct BugReport: Equatable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct SubmitBugReportResponse: Decodable {
|
struct SubmitBugReportResponse: Decodable {
|
||||||
var reportUrl: String?
|
var reportURL: String?
|
||||||
|
|
||||||
|
enum CodingKeys: String, CodingKey {
|
||||||
|
case reportURL = "report_url"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum BugReportServiceError: LocalizedError {
|
enum BugReportServiceError: LocalizedError {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class BugReportScreenViewModelTests: XCTestCase {
|
|||||||
let mockService = BugReportServiceMock()
|
let mockService = BugReportServiceMock()
|
||||||
mockService.submitBugReportProgressListenerClosure = { _, _ in
|
mockService.submitBugReportProgressListenerClosure = { _, _ in
|
||||||
await Task.yield()
|
await Task.yield()
|
||||||
return .success(SubmitBugReportResponse(reportUrl: "https://test.test"))
|
return .success(SubmitBugReportResponse(reportURL: "https://test.test"))
|
||||||
}
|
}
|
||||||
|
|
||||||
let clientProxy = ClientProxyMock(.init(userID: "@mock.client.com", deviceID: "ABCDEFGH"))
|
let clientProxy = ClientProxyMock(.init(userID: "@mock.client.com", deviceID: "ABCDEFGH"))
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class BugReportServiceTests: XCTestCase {
|
|||||||
override func setUpWithError() throws {
|
override func setUpWithError() throws {
|
||||||
let bugReportServiceMock = BugReportServiceMock()
|
let bugReportServiceMock = BugReportServiceMock()
|
||||||
bugReportServiceMock.underlyingCrashedLastRun = false
|
bugReportServiceMock.underlyingCrashedLastRun = false
|
||||||
bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportUrl: "https://www.example.com/123"))
|
bugReportServiceMock.submitBugReportProgressListenerReturnValue = .success(SubmitBugReportResponse(reportURL: "https://www.example.com/123"))
|
||||||
bugReportService = bugReportServiceMock
|
bugReportService = bugReportServiceMock
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +37,8 @@ class BugReportServiceTests: XCTestCase {
|
|||||||
files: [])
|
files: [])
|
||||||
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
|
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
|
||||||
let response = try await bugReportService.submitBugReport(bugReport, progressListener: progressSubject).get()
|
let response = try await bugReportService.submitBugReport(bugReport, progressListener: progressSubject).get()
|
||||||
XCTAssertFalse(response.reportUrl.isEmpty)
|
let reportURL = try XCTUnwrap(response.reportURL)
|
||||||
|
XCTAssertFalse(reportURL.isEmpty)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testInitialStateWithRealService() throws {
|
func testInitialStateWithRealService() throws {
|
||||||
@@ -82,7 +83,7 @@ class BugReportServiceTests: XCTestCase {
|
|||||||
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
|
let progressSubject = CurrentValueSubject<Double, Never>(0.0)
|
||||||
let response = try await service.submitBugReport(bugReport, progressListener: progressSubject).get()
|
let response = try await service.submitBugReport(bugReport, progressListener: progressSubject).get()
|
||||||
|
|
||||||
XCTAssertEqual(response.reportUrl, "https://example.com/123")
|
XCTAssertEqual(response.reportURL, "https://example.com/123")
|
||||||
}
|
}
|
||||||
|
|
||||||
func testLogsMaxSize() {
|
func testLogsMaxSize() {
|
||||||
|
|||||||
Reference in New Issue
Block a user