Merge pull request #323 from missive/nolan/hinaloe-test

test: add test for short_names in custom emoji
release
Nolan Lawson 2019-03-23 15:06:35 -07:00 committed by GitHub
commit 7a94080f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 2 deletions

View File

@ -134,7 +134,7 @@ export default class Category extends React.Component {
updateDisplay(display) { updateDisplay(display) {
var emojis = this.getEmojis() var emojis = this.getEmojis()
if (!emojis) { if (!emojis || !this.container) {
return return
} }

View File

@ -1,5 +1,6 @@
import React from 'react' import React from 'react'
import NimblePicker from '../nimble-picker' import NimblePicker from '../nimble-picker'
import NimbleEmojiIndex from '../../../utils/emoji-index/nimble-emoji-index'
import renderer from 'react-test-renderer' import renderer from 'react-test-renderer'
import data from '../../../../data/apple' import data from '../../../../data/apple'
@ -27,3 +28,36 @@ test('maintains category ids after it is filtered', () => {
const categoriesWithIds = subject.categories.filter((category) => category.id) const categoriesWithIds = subject.categories.filter((category) => category.id)
expect(categoriesWithIds.length).toEqual(10) expect(categoriesWithIds.length).toEqual(10)
}) })
test('with custom emoji and tooltip', () => {
const custom = [
{
id: 'custom_name',
name: 'custom_name',
short_names: ['custom_name'],
text: '',
emoticons: [],
keywords: ['custom_name'],
imageUrl: 'https://example.com/emoji',
custom: true,
},
{
id: 'custom_name2',
name: 'custom_name2',
short_names: ['custom_name2'],
text: '',
emoticons: [],
keywords: ['custom_name2'],
imageUrl: 'https://example.com/emoji',
custom: true,
},
]
const subject = render({
emojiTooltip: true,
autoFocus: true,
custom,
})
subject.handleSearch(
new NimbleEmojiIndex(subject.data).search('custom_', { custom }),
)
})

View File

@ -355,7 +355,9 @@ export default class NimblePicker extends React.PureComponent {
} }
this.forceUpdate() this.forceUpdate()
this.scroll.scrollTop = 0 if (this.scroll) {
this.scroll.scrollTop = 0
}
this.handleScroll() this.handleScroll()
} }