mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
d3b578e440
This adds the "common" short name to the list of strings to match the search text against. Previously, only the "other" short names were included in the comparison. This causes an issue for certain emojis like, for instance, the "Hundred Points Symbol" where the term "100" is *only* included in the common short name. As a result, the emoji did not previously show up when searching for "100". Note that as a side effect, searching for "2" will now also return things such as the "dog2" emoji. This matches the behavior in the Element Android app and also in the emoji-mart Node.js package. Closes: #4063 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
72 lines
2 KiB
Swift
72 lines
2 KiB
Swift
/*
|
||
Copyright 2021 New Vector Ltd
|
||
|
||
Licensed under the Apache License, Version 2.0 (the "License");
|
||
you may not use this file except in compliance with the License.
|
||
You may obtain a copy of the License at
|
||
|
||
http://www.apache.org/licenses/LICENSE-2.0
|
||
|
||
Unless required by applicable law or agreed to in writing, software
|
||
distributed under the License is distributed on an "AS IS" BASIS,
|
||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||
See the License for the specific language governing permissions and
|
||
limitations under the License.
|
||
*/
|
||
|
||
import XCTest
|
||
|
||
@testable import Riot
|
||
|
||
class EmojiStoreTests: XCTestCase {
|
||
|
||
private lazy var store = loadStore()
|
||
|
||
// MARK: - Tests
|
||
|
||
func testFinds💯WhenSearchingForHundred() {
|
||
find("hundred", expect: "💯")
|
||
}
|
||
|
||
func testFinds💯WhenSearchingFor100() {
|
||
find("100", expect: "💯")
|
||
}
|
||
|
||
func testFinds2️⃣WhenSearchingForTwo() {
|
||
find("two", expect: "2️⃣")
|
||
}
|
||
|
||
func testFinds2️⃣WhenSearchingFor2() {
|
||
find("2", expect: "2️⃣")
|
||
}
|
||
|
||
// MARK: - Helpers
|
||
|
||
private func loadStore() -> EmojiStore {
|
||
let store = EmojiStore()
|
||
let emojiService = EmojiMartService()
|
||
let expectation = self.expectation(description: "The wai-ai-ting is the hardest part")
|
||
|
||
emojiService.getEmojiCategories { response in
|
||
switch response {
|
||
case .success(let categories):
|
||
store.set(categories)
|
||
expectation.fulfill()
|
||
case .failure(let error):
|
||
XCTFail("Failed to load emojis: \(error)")
|
||
}
|
||
}
|
||
|
||
waitForExpectations(timeout: 2) { error in
|
||
XCTAssertNil(error)
|
||
}
|
||
|
||
return store
|
||
}
|
||
|
||
private func find(_ searchText: String, expect emoji: String) {
|
||
let emojis = store.findEmojiItemsSortedByCategory(with: searchText).flatMap { $0.emojis.map { $0.value } }
|
||
XCTAssert(emojis.contains(emoji), "Search text \"\(searchText)\" should find \"\(emoji)\" but only found \(emojis)")
|
||
}
|
||
|
||
}
|