diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 18:08:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-14 18:08:42 +0300 |
commit | 99670fc6a027caee34a6537c8def2e998d1ac5c2 (patch) | |
tree | a2ea3ec131d3cb155e13140c8486f1be2a5822b4 /spec/frontend/helpers | |
parent | c9ca178ba4c9a3e48d9d069f7d7486a29827cc61 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/helpers')
-rw-r--r-- | spec/frontend/helpers/emoji.js | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/spec/frontend/helpers/emoji.js b/spec/frontend/helpers/emoji.js index 0f257c32a68..e8a93e21818 100644 --- a/spec/frontend/helpers/emoji.js +++ b/spec/frontend/helpers/emoji.js @@ -4,42 +4,64 @@ import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; export const emojiFixtureMap = { atom: { - name: 'atom', moji: '⚛', description: 'atom symbol', unicodeVersion: '4.1', aliases: ['atom_symbol'], }, bomb: { - name: 'bomb', moji: '💣', unicodeVersion: '6.0', description: 'bomb', - aliases: [], }, construction_worker_tone5: { - name: 'construction_worker_tone5', moji: '👷🏿', unicodeVersion: '8.0', description: 'construction worker tone 5', - aliases: [], }, five: { - name: 'five', moji: '5️⃣', unicodeVersion: '3.0', description: 'keycap digit five', - aliases: [], }, grey_question: { - name: 'grey_question', moji: '❔', unicodeVersion: '6.0', description: 'white question mark ornament', - aliases: [], + }, + + // used for regression tests + // black_heart MUST come before heart + // custard MUST come before star + black_heart: { + moji: '🖤', + unicodeVersion: '1.1', + description: 'black heart', + }, + heart: { + moji: '❤', + unicodeVersion: '1.1', + description: 'heavy black heart', + }, + custard: { + moji: '🍮', + unicodeVersion: '6.0', + description: 'custard', + }, + star: { + moji: '⭐', + unicodeVersion: '5.1', + description: 'white medium star', }, }; +Object.keys(emojiFixtureMap).forEach(k => { + emojiFixtureMap[k].name = k; + if (!emojiFixtureMap[k].aliases) { + emojiFixtureMap[k].aliases = []; + } +}); + export async function initEmojiMock() { const emojiData = Object.fromEntries( Object.values(emojiFixtureMap).map(m => { |