Skip to content

Commit aeb6f44

Browse files
committed
Update Tests after Rebase
1 parent 9dce221 commit aeb6f44

File tree

2 files changed

+11
-19
lines changed

2 files changed

+11
-19
lines changed

Tests/MeiliSearchIntegrationTests/SettingsTests.swift

+5-9
Original file line numberDiff line numberDiff line change
@@ -556,16 +556,12 @@ class SettingsTests: XCTestCase {
556556
self.client.waitForTask(task: task) { result in
557557
switch result {
558558
case .success(let task):
559-
XCTAssertEqual("settingsUpdate", task.type)
559+
XCTAssertEqual("settingsUpdate", task.type.description)
560560
XCTAssertEqual(Task.Status.succeeded, task.status)
561-
if let details = task.details {
562-
if let typoTolerance = details.typoTolerance {
563-
XCTAssertEqual(newTypoTolerance, typoTolerance)
564-
} else {
565-
XCTFail("typoTolerance should not be nil")
566-
}
561+
if case .settingsUpdate(let details) = task.details {
562+
XCTAssertEqual(newTypoTolerance, details.typoTolerance)
567563
} else {
568-
XCTFail("details should exists in details field of task")
564+
XCTFail("settingsUpdate details should be set by task")
569565
}
570566
expectation.fulfill()
571567
case .failure(let error):
@@ -593,7 +589,7 @@ class SettingsTests: XCTestCase {
593589
self.client.waitForTask(task: task) { result in
594590
switch result {
595591
case .success(let task):
596-
XCTAssertEqual("settingsUpdate", task.type)
592+
XCTAssertEqual("settingsUpdate", task.type.description)
597593
XCTAssertEqual(Task.Status.succeeded, task.status)
598594
expectation.fulfill()
599595
case .failure(let error):

Tests/MeiliSearchUnitTests/SettingsTests.swift

+6-10
Original file line numberDiff line numberDiff line change
@@ -892,16 +892,14 @@ class SettingsTests: XCTestCase {
892892
self.wait(for: [expectation], timeout: TESTS_TIME_OUT)
893893
}
894894

895-
func testUpdateTypoTolerance() {
895+
func testUpdateTypoTolerance() throws {
896896
let jsonString = """
897897
{"taskUid":0,"indexUid":"movies_test","status":"enqueued","type":"settingsUpdate","enqueuedAt":"2022-07-27T19:03:50.494232841Z"}
898898
"""
899899

900900
// Prepare the mock server
901-
let decoder = JSONDecoder()
902-
let stubTask: TaskInfo = try! decoder.decode(
903-
TaskInfo.self,
904-
from: jsonString.data(using: .utf8)!)
901+
let decoder = Constants.customJSONDecoder
902+
let stubTask: TaskInfo = try decoder.decode(TaskInfo.self, from: Data(jsonString.utf8))
905903

906904
session.pushData(jsonString)
907905
let typoTolerance: TypoTolerance = .init(enabled: false)
@@ -922,16 +920,14 @@ class SettingsTests: XCTestCase {
922920
self.wait(for: [expectation], timeout: TESTS_TIME_OUT)
923921
}
924922

925-
func testResetTypoTolerance() {
923+
func testResetTypoTolerance() throws {
926924
let jsonString = """
927925
{"taskUid":0,"indexUid":"movies_test","status":"enqueued","type":"settingsUpdate","enqueuedAt":"2022-07-27T19:03:50.494232841Z"}
928926
"""
929927

930928
// Prepare the mock server
931-
let decoder = JSONDecoder()
932-
let stubTask: TaskInfo = try! decoder.decode(
933-
TaskInfo.self,
934-
from: jsonString.data(using: .utf8)!)
929+
let decoder = Constants.customJSONDecoder
930+
let stubTask: TaskInfo = try decoder.decode(TaskInfo.self, from: Data(jsonString.utf8))
935931
session.pushData(jsonString)
936932

937933
// Start the test with the mocked server

0 commit comments

Comments
 (0)