Merge #233

233: Fix filter tests failing because of an invisible character  r=bidoubiwa a=bidoubiwa

Fixes #210 


Co-authored-by: Damien Rivet <[email protected]>
Co-authored-by: cvermand <[email protected]>
Co-authored-by: Charlotte Vermandel <[email protected]>

Author: 3 people

Tests/MeiliSearchIntegrationTests/SearchTests.swift

@@ -62,7 +62,7 @@ private let books: [Book] = [
   Book(id: 456, title: "Le Petit Prince", comment: "A french book", genres: ["Novel"]),
   Book(id: 2, title: "Le Rouge et le Noir", comment: "Another french book", genres: ["Bildungsroman"]),
   Book(id: 1, title: "Alice In Wonderland", comment: "A weird book", genres: ["Fantasy"]),
-  Book(id: 1344, title: "The Hobbit", comment: "An awesome book", genres: ["High fantasy‎"]),
+  Book(id: 1344, title: "The Hobbit", comment: "An awesome book", genres: ["High fantasy"]),
   Book(id: 4, title: "Harry Potter and the Half-Blood Prince", comment: "The best book", genres: ["Fantasy"]),
   Book(id: 42, title: "The Hitchhiker's Guide to the Galaxy", genres: ["Novel"]),
   Book(id: 1844, title: "A Moreninha", comment: "A Book from Joaquim Manuel de Macedo", genres: ["Novel"])
@@ -666,10 +666,43 @@ class SearchTests: XCTestCase {
           XCTFail("Failed to search with testSearchFacetsFilters")
         }
       }
+    }
+    self.wait(for: [expectation], timeout: 2.0)
+  }
+
+  func testSearchFilterWithEmptySpace() {
+    let expectation = XCTestExpectation(description: "Search for Books using filters with a space in the value")
+
+    configureFilters {
+      typealias MeiliResult = Result<SearchResult<Book>, Error>
+
+      let query = ""
+      let limit = 5
+      let filter = "genres = 'High fantasy'"
+      let parameters = SearchParameters(query: query, limit: limit, filter: filter)
+
+      self.index.search(parameters) { (result: MeiliResult) in
+        switch result {
+        case .success(let documents):
+          XCTAssertEqual(documents.query, query)
+          XCTAssertEqual(documents.limit, limit)
+          XCTAssertEqual(documents.hits.count, 1)
+          guard let book: Book = documents.hits.first(where: { book in book.id == 1344 }) else {
+            XCTFail("Failed to search with testSearchFilterWithEmptySpace")
+            return
+          }
+
+          XCTAssertEqual("The Hobbit", book.title)
 
+          expectation.fulfill()
+
+        case .failure:
+          XCTFail("Failed to search with testSearchFilterWithEmptySpace")
+        }
+      }
     }
 
-    self.wait(for: [expectation], timeout: 2.0)
+    wait(for: [expectation], timeout: 5.0)
   }
 
   // MARK: Facets distribution
@@ -698,7 +731,7 @@ class SearchTests: XCTestCase {
           let expected: [String: [String: Int]] = [
             "genres": [
               "Classic Regency nove": 1,
-              "High fantasy‎": 1,
+              "High fantasy": 1,
               "Fantasy": 2,
               "Novel": 2,
               "Bildungsroman": 1

Tests/MeiliSearchUnitTests/SearchTests.swift

@@ -139,6 +139,115 @@ class SearchTests: XCTestCase {
 
     self.wait(for: [expectation], timeout: 5.0)
   }
+
+  func testShouldFilterValuesWithSpaces() {
+    let jsonString = """
+      {
+        "hits": [
+          {
+            "id": 123,
+            "title": "Pride and Prejudice",
+            "comment": "A great book",
+            "genre": "romance",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          },
+          {
+            "id": 456,
+            "title": "Le Petit Prince",
+            "comment": "A french book about a prince that walks on little cute planets",
+            "genre": "adventure",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          },
+          {
+            "id": 2,
+            "title": "Le Rouge et le Noir",
+            "comment": "Another french book",
+            "genre": "romance",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          },
+          {
+            "id": 1,
+            "title": "Alice In Wonderland",
+            "comment": "A weird book",
+            "genre": "adventure",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          },
+          {
+            "id": 1344,
+            "title": "The Hobbit",
+            "comment": "An awesome book",
+            "genre": "sci fi",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          },
+          {
+            "id": 4,
+            "title": "Harry Potter and the Half-Blood Prince",
+            "comment": "The best book",
+            "genre": "fantasy",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          },
+          {
+            "id": 42,
+            "title": "The Hitchhiker's Guide to the Galaxy",
+            "genre": "fantasy",
+            "poster": "https://image.tmdb.org/t/p/w1280/jjHu128XLARc2k4cJrblAvZe0HE.jpg",
+            "overview": "Delve into the world of Batman and the vigilante justice tha",
+            "release_date": "2020-04-04T19:59:49.259572Z"
+          }
+        ],
+        "offset": 0,
+        "limit": 20,
+        "processingTimeMs": 2,
+        "nbHits": 1,
+        "query": "h",
+        "genre": "sci fi"
+      }
+      """
+
+    // Prepare the mock server
+    guard let data = jsonString.data(using: .utf8), let stubSearchResult = try? Constants.customJSONDecoder.decode(SearchResult<Movie>.self, from: data) else {
+      XCTFail("Failed to encode JSON data")
+      return
+    }
+
+    session.pushData(jsonString)
+
+    // Start the test with the mocked server
+    let searchParameters = SearchParameters(
+      query: "h",
+      filter: "genre = 'sci fi'",
+      sort: ["id:asc"]
+    )
+
+    let expectation = XCTestExpectation(description: "Searching for the hobbit")
+    typealias MeiliResult = Result<SearchResult<Movie>, Swift.Error>
+
+    index .search(searchParameters) { (result: MeiliResult) in
+      switch result {
+      case .success(let searchResult):
+        XCTAssertEqual(stubSearchResult, searchResult)
+        XCTAssertEqual(searchResult.nbHits, 1)
+      case .failure:
+        XCTFail("Failed to search for botman")
+      }
+
+      expectation.fulfill()
+    }
+
+    wait(for: [expectation], timeout: 5.0)
+  }
 }
 // swiftlint:enable force_unwrapping
 // swiftlint:enable force_try