diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-05 11:58:18 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-05 11:58:18 -0400 |
commit | dc2f2a800105b77e665ec2a00c6290f35b1a2ba3 (patch) | |
tree | 82f23c2e72a7c785f55c2d6c1c35c10c16994918 /webapp/tests | |
parent | a65f1fc266f15eaa8f79541d4d11440c3d356bb6 (diff) | |
download | chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.tar.gz chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.tar.bz2 chat-dc2f2a800105b77e665ec2a00c6290f35b1a2ba3.zip |
PLT-3145 Custom Emojis (#3381)
* Reorganized Backstage code to use a view controller and separated it from integrations code
* Renamed InstalledIntegrations component to BackstageList
* Added EmojiList page
* Added AddEmoji page
* Added custom emoji to autocomplete and text formatter
* Moved system emoji to EmojiStore
* Stopped trying to get emoji before logging in
* Rerender posts when emojis change
* Fixed submit handler on backstage pages to properly support enter
* Removed debugging code
* Updated javascript driver
* Fixed unit tests
* Fixed backstage routes
* Added clientside validation to prevent users from creating an emoji with the same name as a system one
* Fixed AddEmoji page to properly redirect when an emoji is created successfully
* Fixed updating emoji list when an emoji is deleted
* Added type prop to BackstageList to properly support using a table for the list
* Added help text to EmojiList
* Fixed backstage on smaller screen sizes
* Disable custom emoji by default
* Improved restrictions on creating emojis
* Fixed non-admin users seeing the option to delete each other's emojis
* Fixing gofmt
* Fixed emoji unit tests
* Fixed trying to get emoji from the server when it's disabled
Diffstat (limited to 'webapp/tests')
-rw-r--r-- | webapp/tests/emoticons.test.jsx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/webapp/tests/emoticons.test.jsx b/webapp/tests/emoticons.test.jsx index bb0421651..bf025e6b2 100644 --- a/webapp/tests/emoticons.test.jsx +++ b/webapp/tests/emoticons.test.jsx @@ -3,42 +3,45 @@ import assert from 'assert'; +import EmojiStore from 'stores/emoji_store.jsx'; import * as Emoticons from 'utils/emoticons.jsx'; describe('Emoticons', function() { this.timeout(100000); it('handleEmoticons', function(done) { + const emojis = EmojiStore.getEmojis(); + assert.equal( - Emoticons.handleEmoticons(':goat: :dash:', new Map()), + Emoticons.handleEmoticons(':goat: :dash:', new Map(), emojis), 'MM_EMOTICON0 MM_EMOTICON1', 'should replace emoticons with tokens' ); assert.equal( - Emoticons.handleEmoticons(':goat::dash:', new Map()), + Emoticons.handleEmoticons(':goat::dash:', new Map(), emojis), 'MM_EMOTICON0MM_EMOTICON1', 'should replace emoticons not separated by whitespace' ); assert.equal( - Emoticons.handleEmoticons('/:goat:..:dash:)', new Map()), + Emoticons.handleEmoticons('/:goat:..:dash:)', new Map(), emojis), '/MM_EMOTICON0..MM_EMOTICON1)', 'should replace emoticons separated by punctuation' ); assert.equal( - Emoticons.handleEmoticons('asdf:goat:asdf:dash:asdf', new Map()), + Emoticons.handleEmoticons('asdf:goat:asdf:dash:asdf', new Map(), emojis), 'asdfMM_EMOTICON0asdfMM_EMOTICON1asdf', 'should replace emoticons separated by text' ); assert.equal( - Emoticons.handleEmoticons(':asdf: :goat : : dash:', new Map()), + Emoticons.handleEmoticons(':asdf: :goat : : dash:', new Map(), emojis), ':asdf: :goat : : dash:', 'shouldn\'t replace invalid emoticons' ); done(); }); -});
\ No newline at end of file +}); |