diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-28 05:51:30 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-28 05:51:30 +0000 |
| commit | 08ad0af49c017d740b43588c0809b3811d25a448 (patch) | |
| tree | b6dbccf4e0c62bd4a8bc79e51934f008122cbe17 /spec/javascripts | |
| parent | a7f114b1368fd11dba036f67b2ef66c2bf39f02a (diff) | |
| parent | 88e12ac94b13bc4ee57a60adca64af5cf7d14030 (diff) | |
| download | gitlab-ce-08ad0af49c017d740b43588c0809b3811d25a448.tar.gz | |
Merge branch 'refactor-emoji-utils' into 'master'
Refactor emoji helpers in preparation for async loading
See merge request !12432
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/emoji_spec.js (renamed from spec/javascripts/gl_emoji_spec.js) | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js b/spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js index 1ed96a67478..ec2c549e032 100644 --- a/spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js +++ b/spec/javascripts/behaviors/gl_emoji/unicode_support_map_spec.js @@ -1,4 +1,4 @@ -import { getUnicodeSupportMap } from '~/behaviors/gl_emoji/unicode_support_map'; +import getUnicodeSupportMap from '~/emoji/support/unicode_support_map'; import AccessorUtilities from '~/lib/utils/accessor'; describe('Unicode Support Map', () => { diff --git a/spec/javascripts/gl_emoji_spec.js b/spec/javascripts/emoji_spec.js index a09e0072fa8..fa11c602ec3 100644 --- a/spec/javascripts/gl_emoji_spec.js +++ b/spec/javascripts/emoji_spec.js @@ -1,12 +1,11 @@ -import { glEmojiTag } from '~/behaviors/gl_emoji'; -import { - isEmojiUnicodeSupported, +import { glEmojiTag } from '~/emoji'; +import isEmojiUnicodeSupported, { isFlagEmoji, isKeycapEmoji, isSkinToneComboEmoji, isHorceRacingSkinToneComboEmoji, isPersonZwjEmoji, -} from '~/behaviors/gl_emoji/is_emoji_unicode_supported'; +} from '~/emoji/support/is_emoji_unicode_supported'; const emptySupportMap = { personZwj: false, |