From 2ab5c5d3db372dd7af347ef828ac1bf6f4a2387c Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 10:35:49 -0300 Subject: [PATCH 01/12] Make DocumentsQuery#fields optional --- Sources/MeiliSearch/QueryParameters/DocumentsQuery.swift | 6 +++--- .../QueryParameters/DocumentsQueryTests.swift | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Sources/MeiliSearch/QueryParameters/DocumentsQuery.swift b/Sources/MeiliSearch/QueryParameters/DocumentsQuery.swift index aaac0d8d..e0c7fa16 100644 --- a/Sources/MeiliSearch/QueryParameters/DocumentsQuery.swift +++ b/Sources/MeiliSearch/QueryParameters/DocumentsQuery.swift @@ -3,19 +3,19 @@ import Foundation public class DocumentsQuery: Queryable { private var limit: Int? private var offset: Int? - private var fields: [String] + private var fields: [String]? init(limit: Int? = nil, offset: Int? = nil, fields: [String]? = nil) { self.offset = offset self.limit = limit - self.fields = fields ?? [] + self.fields = fields } internal func buildQuery() -> [String: Codable?] { [ "limit": limit, "offset": offset, - "fields": fields.isEmpty ? nil : fields.joined(separator: ",") + "fields": fields != nil ? fields?.joined(separator: ",") : nil ] } } diff --git a/Tests/MeiliSearchUnitTests/QueryParameters/DocumentsQueryTests.swift b/Tests/MeiliSearchUnitTests/QueryParameters/DocumentsQueryTests.swift index f3915e6b..dbc1183e 100644 --- a/Tests/MeiliSearchUnitTests/QueryParameters/DocumentsQueryTests.swift +++ b/Tests/MeiliSearchUnitTests/QueryParameters/DocumentsQueryTests.swift @@ -10,6 +10,7 @@ class DocumentsQueryTests: XCTestCase { ["?limit=2": DocumentsQuery(limit: 2, offset: nil)], ["?offset=2": DocumentsQuery(offset: 2)], ["?limit=10&offset=0": DocumentsQuery(limit: 10, offset: 0)], + ["?fields=&offset=0": DocumentsQuery(offset: 0, fields: [])], ["": DocumentsQuery()] ] From 94338c0efdc02ff2277c77ff5f9c2930ebb6f0a2 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 10:38:55 -0300 Subject: [PATCH 02/12] Improve documents tests & Fix querystring builder in documents#get --- Sources/MeiliSearch/Documents.swift | 3 ++- Tests/MeiliSearchUnitTests/DocumentsTests.swift | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Sources/MeiliSearch/Documents.swift b/Sources/MeiliSearch/Documents.swift index d4f764fa..7169363d 100755 --- a/Sources/MeiliSearch/Documents.swift +++ b/Sources/MeiliSearch/Documents.swift @@ -22,7 +22,8 @@ struct Documents { var query: String = "/indexes/\(uid)/documents/\(identifier)" if fields != nil { - query.append(fields?.joined(separator: ",") ?? "") + let fieldsQuery = "?fields=\(fields?.joined(separator: ",") ?? "")" + query.append(fieldsQuery) } self.request.get(api: query) { result in diff --git a/Tests/MeiliSearchUnitTests/DocumentsTests.swift b/Tests/MeiliSearchUnitTests/DocumentsTests.swift index 699eff5f..40036312 100755 --- a/Tests/MeiliSearchUnitTests/DocumentsTests.swift +++ b/Tests/MeiliSearchUnitTests/DocumentsTests.swift @@ -6,8 +6,8 @@ import Foundation // swiftlint:disable force_try // swiftlint:disable line_length private struct Movie: Codable, Equatable { - let id: Int? - let title: String? + let id: Int + let title: String let overview: String? let releaseDate: Date? @@ -241,6 +241,8 @@ class DocumentsTests: XCTestCase { self.index.getDocument(identifier, fields: ["title", "id"]) { (result: Result) in switch result { case .success(let movie): + XCTAssertEqual(self.session.nextDataTask.request?.url?.query, "fields=title,id") + XCTAssertEqual(stubMovie, movie) case .failure: XCTFail("Failed to get Movies document") @@ -250,8 +252,6 @@ class DocumentsTests: XCTestCase { } catch { XCTFail("Failed to parse document") } - -// self.wait(for: [expectation], timeout: TESTS_TIME_OUT) } func testGetDocumentsWithParameters() { From fedb6467fda07b8821ef4928cdb1b10c0c904e4c Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 10:43:46 -0300 Subject: [PATCH 03/12] Improve readability on querystring documents#getAll --- Sources/MeiliSearch/Documents.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Sources/MeiliSearch/Documents.swift b/Sources/MeiliSearch/Documents.swift index 7169363d..81baeb0d 100755 --- a/Sources/MeiliSearch/Documents.swift +++ b/Sources/MeiliSearch/Documents.swift @@ -46,7 +46,9 @@ struct Documents { params: DocumentsQuery? = nil, _ completion: @escaping (Result, Swift.Error>) -> Void) where T: Codable, T: Equatable { - request.get(api: "/indexes/\(uid)/documents\(params?.toQuery() ?? "")") { result in + let queryParams = params?.toQuery() ?? "" + + request.get(api: "/indexes/\(uid)/documents\(queryParams)") { result in switch result { case .success(let data): guard let data: Data = data else { From 47639bfaa554552a1cae0d1d546bf1bf8a9999aa Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 10:56:36 -0300 Subject: [PATCH 04/12] Make Key#description optional --- Sources/MeiliSearch/Model/KeyParams.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Sources/MeiliSearch/Model/KeyParams.swift b/Sources/MeiliSearch/Model/KeyParams.swift index ce846add..20b158c0 100644 --- a/Sources/MeiliSearch/Model/KeyParams.swift +++ b/Sources/MeiliSearch/Model/KeyParams.swift @@ -13,14 +13,12 @@ public struct KeyParams: Codable, Equatable { public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) + if uid != nil { try container.encode(uid, forKey: .uid) } - if name != nil { - try container.encode(name, forKey: .name) - } - + try container.encode(name, forKey: .name) try container.encode(description, forKey: .description) try container.encode(actions, forKey: .actions) try container.encode(indexes, forKey: .indexes) From 568651923f67287e1d695c2303d058c067ca9626 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:05:56 -0300 Subject: [PATCH 05/12] Replace Results with IndexResults --- Sources/MeiliSearch/Client.swift | 2 +- Sources/MeiliSearch/Indexes.swift | 5 +++-- Sources/MeiliSearch/Model/IndexesResults.swift | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Sources/MeiliSearch/Client.swift b/Sources/MeiliSearch/Client.swift index 45e27302..77a518de 100755 --- a/Sources/MeiliSearch/Client.swift +++ b/Sources/MeiliSearch/Client.swift @@ -94,7 +94,7 @@ public struct MeiliSearch { */ public func getIndexes( params: IndexesQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { Indexes.getAll(config: self.config, params: params, completion) } diff --git a/Sources/MeiliSearch/Indexes.swift b/Sources/MeiliSearch/Indexes.swift index 80490ab6..1a8a54f7 100755 --- a/Sources/MeiliSearch/Indexes.swift +++ b/Sources/MeiliSearch/Indexes.swift @@ -101,7 +101,7 @@ public struct Indexes { completes the query request. It returns a `Result` object that contains `[Index]` value if the request was successful or `Error` if a failure occurred. */ - public static func getAll(config: Config, params: IndexesQuery? = nil, _ completion: @escaping (Result, Swift.Error>) -> Void) { + public static func getAll(config: Config, params: IndexesQuery? = nil, _ completion: @escaping (Result) -> Void) { Request(config).get(api: "/indexes", param: params?.toQuery()) { result in switch result { case .success(let result): @@ -111,7 +111,8 @@ public struct Indexes { } do { - let indexes: Results = try Constants.customJSONDecoder.decode(Results.self, from: result) + let indexes = try Constants.customJSONDecoder.decode(IndexesResults.self, from: result) + completion(.success(indexes)) } catch let error { completion(.failure(error)) diff --git a/Sources/MeiliSearch/Model/IndexesResults.swift b/Sources/MeiliSearch/Model/IndexesResults.swift index 093c19ac..0d5e9ce7 100644 --- a/Sources/MeiliSearch/Model/IndexesResults.swift +++ b/Sources/MeiliSearch/Model/IndexesResults.swift @@ -4,8 +4,8 @@ import Foundation `IndexesResults` is a wrapper used in the indexes routes to handle the returned data. */ -public struct IndexesResults: Codable, Equatable { - public let results: [T] +public struct IndexesResults: Codable, Equatable { + public let results: [Index] public let offset: Int public let limit: Int public let total: Int From 800704d0dc602e4b64c56eb18c0584ac1bb8ac50 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:16:33 -0300 Subject: [PATCH 06/12] Create KeysResults and TasksResults specific types --- Sources/MeiliSearch/Model/KeysResults.swift | 12 ++++++++++++ Sources/MeiliSearch/Model/TasksResults.swift | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 Sources/MeiliSearch/Model/KeysResults.swift create mode 100644 Sources/MeiliSearch/Model/TasksResults.swift diff --git a/Sources/MeiliSearch/Model/KeysResults.swift b/Sources/MeiliSearch/Model/KeysResults.swift new file mode 100644 index 00000000..545eaee3 --- /dev/null +++ b/Sources/MeiliSearch/Model/KeysResults.swift @@ -0,0 +1,12 @@ +import Foundation + +/** + `KeysResults` is a wrapper used in the indexes routes to handle the returned data. + */ + +public struct KeysResults: Codable, Equatable { + public let results: [Key] + public let offset: Int + public let limit: Int + public let total: Int +} diff --git a/Sources/MeiliSearch/Model/TasksResults.swift b/Sources/MeiliSearch/Model/TasksResults.swift new file mode 100644 index 00000000..57d5e60b --- /dev/null +++ b/Sources/MeiliSearch/Model/TasksResults.swift @@ -0,0 +1,12 @@ +import Foundation + +/** + `IndexesResults` is a wrapper used in the indexes routes to handle the returned data. + */ + +public struct TasksResults: Codable, Equatable { + public let results: [Task] + public let next: Int? + public let from: Int? + public let limit: Int +} From 9b2866f88c61ac1d9b936798fb9806feb83901d1 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:16:55 -0300 Subject: [PATCH 07/12] Remove Results type --- Sources/MeiliSearch/Model/Results.swift | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 Sources/MeiliSearch/Model/Results.swift diff --git a/Sources/MeiliSearch/Model/Results.swift b/Sources/MeiliSearch/Model/Results.swift deleted file mode 100644 index cc21fa57..00000000 --- a/Sources/MeiliSearch/Model/Results.swift +++ /dev/null @@ -1,9 +0,0 @@ -import Foundation - -/** - `Results` is a wrapper used in multiple routes returning an array of data. - */ - -public struct Results: Codable, Equatable { - public let results: [T] -} From 98fabaac614ce7898c7ca0577e3941f4ee0b266b Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:17:02 -0300 Subject: [PATCH 08/12] Apply TasksResults, KeysResults & IndexesResults --- Sources/MeiliSearch/Client.swift | 4 ++-- Sources/MeiliSearch/Indexes.swift | 2 +- Sources/MeiliSearch/Keys.swift | 6 ++++-- Sources/MeiliSearch/Tasks.swift | 9 +++++---- Tests/MeiliSearchIntegrationTests/TaskTests.swift | 4 ++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Sources/MeiliSearch/Client.swift b/Sources/MeiliSearch/Client.swift index 77a518de..317d6b3c 100755 --- a/Sources/MeiliSearch/Client.swift +++ b/Sources/MeiliSearch/Client.swift @@ -198,7 +198,7 @@ public struct MeiliSearch { */ public func getTasks( params: TasksQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { self.tasks.getAll(params: params, completion) } @@ -213,7 +213,7 @@ public struct MeiliSearch { */ public func getKeys( params: KeysQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { self.keys.getAll(params: params, completion) } diff --git a/Sources/MeiliSearch/Indexes.swift b/Sources/MeiliSearch/Indexes.swift index 1a8a54f7..d72fc107 100755 --- a/Sources/MeiliSearch/Indexes.swift +++ b/Sources/MeiliSearch/Indexes.swift @@ -472,7 +472,7 @@ public struct Indexes { */ public func getTasks( params: TasksQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { self.tasks.getAll(uid: self.uid, params: params, completion) } diff --git a/Sources/MeiliSearch/Keys.swift b/Sources/MeiliSearch/Keys.swift index e334e870..e53dd78f 100644 --- a/Sources/MeiliSearch/Keys.swift +++ b/Sources/MeiliSearch/Keys.swift @@ -32,7 +32,7 @@ struct Keys { } } - func getAll(params: KeysQuery?, _ completion: @escaping (Result, Swift.Error>) -> Void) { + func getAll(params: KeysQuery?, _ completion: @escaping (Result) -> Void) { self.request.get(api: "/keys", param: params?.toQuery()) { result in switch result { case .success(let data): @@ -40,8 +40,10 @@ struct Keys { completion(.failure(MeiliSearch.Error.dataNotFound)) return } + do { - let keys: Results = try Constants.customJSONDecoder.decode(Results.self, from: data) + let keys = try Constants.customJSONDecoder.decode(KeysResults.self, from: data) + completion(.success(keys)) } catch { completion(.failure(error)) diff --git a/Sources/MeiliSearch/Tasks.swift b/Sources/MeiliSearch/Tasks.swift index 9cc7860f..4f9d920d 100644 --- a/Sources/MeiliSearch/Tasks.swift +++ b/Sources/MeiliSearch/Tasks.swift @@ -42,7 +42,7 @@ struct Tasks { // get all on client func getAll( params: TasksQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { getAll(path: "/tasks", params: params, completion) } @@ -50,7 +50,7 @@ struct Tasks { func getAll( uid: String, params: TasksQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { var query: TasksQuery? if params != nil { @@ -67,12 +67,13 @@ struct Tasks { private func getAll( path: String, params: TasksQuery? = nil, - _ completion: @escaping (Result, Swift.Error>) -> Void) { + _ completion: @escaping (Result) -> Void) { self.request.get(api: path, param: params?.toQuery()) { result in switch result { case .success(let data): do { - let task: Result, Swift.Error> = try Constants.resultDecoder(data: data) + let task: Result = try Constants.resultDecoder(data: data) + completion(task) } catch { completion(.failure(error)) diff --git a/Tests/MeiliSearchIntegrationTests/TaskTests.swift b/Tests/MeiliSearchIntegrationTests/TaskTests.swift index d0d3a8eb..56d3ec4c 100644 --- a/Tests/MeiliSearchIntegrationTests/TaskTests.swift +++ b/Tests/MeiliSearchIntegrationTests/TaskTests.swift @@ -67,7 +67,7 @@ class TasksTests: XCTestCase { switch result { case .success: let index = self.client.index(indexUid) - index.getTasks { (result: Result, Swift.Error>) in + index.getTasks { (result: Result) in switch result { case .success(let tasks): // Only one because index has been deleted and recreated @@ -134,7 +134,7 @@ class TasksTests: XCTestCase { self.wait(for: [addDocExpectation], timeout: TESTS_TIME_OUT) let expectation = XCTestExpectation(description: "Get all tasks of an index") - self.client.getTasks { (result: Result, Swift.Error>) in + self.client.getTasks { (result: Result) in switch result { case .success(let tasks): XCTAssertNotNil(tasks.results) From 418e00f2329a4d7ba4cb4fa42becf3f4e2b5e374 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:36:12 -0300 Subject: [PATCH 09/12] Improve readability to indexUid field --- Sources/MeiliSearch/QueryParameters/TasksQuery.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/MeiliSearch/QueryParameters/TasksQuery.swift b/Sources/MeiliSearch/QueryParameters/TasksQuery.swift index 8aa505bb..628a4cb3 100644 --- a/Sources/MeiliSearch/QueryParameters/TasksQuery.swift +++ b/Sources/MeiliSearch/QueryParameters/TasksQuery.swift @@ -5,9 +5,10 @@ public class TasksQuery: Queryable { private var limit: Int? private var next: Int? private var types: [String] - var indexUid: [String] private var status: [String] + var indexUid: [String] + init(limit: Int? = nil, from: Int? = nil, next: Int? = nil, status: [String]? = nil, types: [String]? = nil, indexUid: [String]? = nil) { self.from = from self.limit = limit From d5a057ee08b27602f17e1187dc69fb238e5fda53 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:43:14 -0300 Subject: [PATCH 10/12] Rename private function Tasks#getAll to Tasks#listTasks --- Sources/MeiliSearch/Client.swift | 2 +- Sources/MeiliSearch/Indexes.swift | 2 +- Sources/MeiliSearch/Tasks.swift | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Sources/MeiliSearch/Client.swift b/Sources/MeiliSearch/Client.swift index 317d6b3c..9c4dc509 100755 --- a/Sources/MeiliSearch/Client.swift +++ b/Sources/MeiliSearch/Client.swift @@ -199,7 +199,7 @@ public struct MeiliSearch { public func getTasks( params: TasksQuery? = nil, _ completion: @escaping (Result) -> Void) { - self.tasks.getAll(params: params, completion) + self.tasks.getTasks(params: params, completion) } // MARK: Keys diff --git a/Sources/MeiliSearch/Indexes.swift b/Sources/MeiliSearch/Indexes.swift index d72fc107..757ffb9a 100755 --- a/Sources/MeiliSearch/Indexes.swift +++ b/Sources/MeiliSearch/Indexes.swift @@ -473,7 +473,7 @@ public struct Indexes { public func getTasks( params: TasksQuery? = nil, _ completion: @escaping (Result) -> Void) { - self.tasks.getAll(uid: self.uid, params: params, completion) + self.tasks.getTasks(uid: self.uid, params: params, completion) } /** diff --git a/Sources/MeiliSearch/Tasks.swift b/Sources/MeiliSearch/Tasks.swift index 4f9d920d..a33bc951 100644 --- a/Sources/MeiliSearch/Tasks.swift +++ b/Sources/MeiliSearch/Tasks.swift @@ -40,14 +40,14 @@ struct Tasks { } // get all on client - func getAll( + func getTasks( params: TasksQuery? = nil, _ completion: @escaping (Result) -> Void) { - getAll(path: "/tasks", params: params, completion) + listTasks(params: params, completion) } // get all on index - func getAll( + func getTasks( uid: String, params: TasksQuery? = nil, _ completion: @escaping (Result) -> Void) { @@ -61,14 +61,13 @@ struct Tasks { query = TasksQuery(indexUid: [uid]) } - getAll(path: "/tasks", params: query, completion) + listTasks(params: query, completion) } - private func getAll( - path: String, + private func listTasks( params: TasksQuery? = nil, _ completion: @escaping (Result) -> Void) { - self.request.get(api: path, param: params?.toQuery()) { result in + self.request.get(api: "/tasks", param: params?.toQuery()) { result in switch result { case .success(let data): do { From b3616650dd08809422d2dc605cc32557b5f06673 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Wed, 3 Aug 2022 11:55:50 -0300 Subject: [PATCH 11/12] Rename key to be clear that we accept key and uid --- .code-samples.meilisearch.yaml | 2 +- Sources/MeiliSearch/Client.swift | 6 +++--- Tests/MeiliSearchIntegrationTests/KeysTests.swift | 4 ++-- Tests/MeiliSearchIntegrationTests/TaskTests.swift | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.code-samples.meilisearch.yaml b/.code-samples.meilisearch.yaml index 4496f848..64c50e6a 100644 --- a/.code-samples.meilisearch.yaml +++ b/.code-samples.meilisearch.yaml @@ -183,7 +183,7 @@ get_all_tasks_1: |- } } get_one_key_1: |- - self.client.getKey(key: "d0552b41536279a0ad88bd595327b96f01176a60c2243e906c52ac02375f9bc4") { result in + self.client.getKey(keyOrUid: "d0552b41536279a0ad88bd595327b96f01176a60c2243e906c52ac02375f9bc4") { result in switch result { case .success(let key): print(key) diff --git a/Sources/MeiliSearch/Client.swift b/Sources/MeiliSearch/Client.swift index 9c4dc509..56bcf579 100755 --- a/Sources/MeiliSearch/Client.swift +++ b/Sources/MeiliSearch/Client.swift @@ -220,15 +220,15 @@ public struct MeiliSearch { /** Get one key's information using the key value. - - parameter key: The key value. + - parameter keyOrUid: The key value. - parameter completion: The completion closure used to notify when the server completes the query request, it returns a `Result` object that contains `Key` value. If the request was sucessful or `Error` if a failure occured. */ public func getKey( - key: String, + keyOrUid: String, _ completion: @escaping (Result) -> Void) { - self.keys.get(key: key, completion) + self.keys.get(key: keyOrUid, completion) } /** diff --git a/Tests/MeiliSearchIntegrationTests/KeysTests.swift b/Tests/MeiliSearchIntegrationTests/KeysTests.swift index 37c2c951..a8ed3613 100644 --- a/Tests/MeiliSearchIntegrationTests/KeysTests.swift +++ b/Tests/MeiliSearchIntegrationTests/KeysTests.swift @@ -70,7 +70,7 @@ class KeysTests: XCTestCase { self.client.createKey(KeyParams(actions: ["*"], indexes: ["*"], expiresAt: nil)) { result in switch result { case .success(let createdKey): - self.client.getKey(key: createdKey.uid) { result in + self.client.getKey(keyOrUid: createdKey.uid) { result in switch result { case .success(let fetchedKey): XCTAssertEqual(fetchedKey.expiresAt, nil) @@ -206,7 +206,7 @@ class KeysTests: XCTestCase { self.client.deleteKey(key: key.key) { result in switch result { case .success: - self.client.getKey(key: key.key) { result in + self.client.getKey(keyOrUid: key.key) { result in switch result { case .success(let key): XCTAssertNotNil(key.description) diff --git a/Tests/MeiliSearchIntegrationTests/TaskTests.swift b/Tests/MeiliSearchIntegrationTests/TaskTests.swift index 56d3ec4c..8ff7bee0 100644 --- a/Tests/MeiliSearchIntegrationTests/TaskTests.swift +++ b/Tests/MeiliSearchIntegrationTests/TaskTests.swift @@ -57,7 +57,7 @@ class TasksTests: XCTestCase { } func testGetTasksIndex() { - let expectation = XCTestExpectation(description: "Add documents") + let expectation = XCTestExpectation(description: "List tasks from index") let indexUid = "\(self.uid)_\(UUID().uuidString)" self.client.createIndex(uid: indexUid) { result in From 1151236d4790c7439d05240bc3b9bbf0558df9d1 Mon Sep 17 00:00:00 2001 From: Bruno Casali Date: Thu, 4 Aug 2022 10:27:52 -0300 Subject: [PATCH 12/12] Improve description and test naming in the search tests --- Tests/MeiliSearchIntegrationTests/SearchTests.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Tests/MeiliSearchIntegrationTests/SearchTests.swift b/Tests/MeiliSearchIntegrationTests/SearchTests.swift index 0da6abee..cf7e59ab 100644 --- a/Tests/MeiliSearchIntegrationTests/SearchTests.swift +++ b/Tests/MeiliSearchIntegrationTests/SearchTests.swift @@ -446,7 +446,7 @@ class SearchTests: XCTestCase { // MARK: Matches tests func testSearchMatches() { - let expectation = XCTestExpectation(description: "Search for Books using matches") + let expectation = XCTestExpectation(description: "Search for Books using showMatchesPosition") typealias MeiliResult = Result, Swift.Error> let limit = 5 @@ -793,7 +793,7 @@ class SearchTests: XCTestCase { // MARK: Facet distribution func testSearchFacetDistribution() { - let expectation = XCTestExpectation(description: "Search for Books using facets distribution") + let expectation = XCTestExpectation(description: "Search for Books using facets") configureFilters { result in switch result { @@ -841,7 +841,7 @@ class SearchTests: XCTestCase { } func testSearchFacetDistributionNullValue() { - let expectation = XCTestExpectation(description: "Search for Books using facets distribution with 0 value") + let expectation = XCTestExpectation(description: "Search for Books using facets with 0 value") configureFilters { result in switch result {