matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix emoji heart tests

Browse Source
This commit is contained in:
Alex Gleason
2020-12-24 14:40:47 -06:00
parent b8121028b7
commit 3d4bd23870
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/components/__tests__/__snapshots__/emoji_selector-test.js.snap
View File

@ -16,7 +16,7 @@ exports[`<EmojiSelector /> renders correctly 1`] = `
className="emoji-react-selector__emoji"
dangerouslySetInnerHTML={
Object {
"__html": "<img draggable=\\"false\\" class=\\"emojione\\" alt=\\"❤\\" title=\\":heart:\\" src=\\"/emoji/2764.svg\\" />",
"__html": "<img draggable=\\"false\\" class=\\"emojione\\" alt=\\"❤️\\" title=\\":heart:\\" src=\\"/emoji/2764.svg\\" />",
}
}
/>

2
app/soapbox/utils/__tests__/emoji_reacts-test.js
View File

@ -158,7 +158,7 @@ describe('getReactForStatus', () => {
],
},
});
expect(getReactForStatus(status)).toEqual('❤');
expect(getReactForStatus(status, ALLOWED_EMOJI)).toEqual('❤');
});
it('returns a thumbs-up for a favourite', () => {

5
app/soapbox/utils/emoji_reacts.js
View File

@ -75,11 +75,12 @@ export const reduceEmoji = (emojiReacts, favouritesCount, favourited, allowedEmo
emojiReacts, favouritesCount, favourited,
))), allowedEmoji));
export const getReactForStatus = status => {
export const getReactForStatus = (status, allowedEmoji=ALLOWED_EMOJI) => {
return reduceEmoji(
status.getIn(['pleroma', 'emoji_reactions'], ImmutableList()),
status.get('favourites_count'),
status.get('favourites_count', 0),
status.get('favourited'),
allowedEmoji,
).filter(e => e.get('me') === true)
.getIn([0, 'name']);
};