diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-20 15:22:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-20 15:22:46 -0400 |
| commit | 68ea0abfa665144164041c9421899bfc21412f8a (patch) | |
| tree | 5d2f2aa5665a084bd1e544d8342e229a8fafc064 /webapp/tests/utils/formatting_hashtags.test.jsx | |
| parent | 270fc41c0ffe52266f821748db9fd8b4e9d10b36 (diff) | |
| download | chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.gz chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.bz2 chat-68ea0abfa665144164041c9421899bfc21412f8a.zip | |
PLT-4457 Added AtMention component to better render at mentions (#6563)
* Moved Utils.searchForTerm into an action
* Added easier importing of index.jsx files
* PLT-4457 Added AtMention component to better render at mentions
* Fixed client unit tests
* Fixed merge conflict
* Fixed merge conflicts
Diffstat (limited to 'webapp/tests/utils/formatting_hashtags.test.jsx')
| -rw-r--r-- | webapp/tests/utils/formatting_hashtags.test.jsx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/webapp/tests/utils/formatting_hashtags.test.jsx b/webapp/tests/utils/formatting_hashtags.test.jsx index 1740a8ce7..917f0135a 100644 --- a/webapp/tests/utils/formatting_hashtags.test.jsx +++ b/webapp/tests/utils/formatting_hashtags.test.jsx @@ -160,13 +160,11 @@ describe('TextFormatting.Hashtags', function() { ); let options = { - usernameMap: { - test: {id: '1234', username: 'test'} - } + atMentions: true }; assert.equal( TextFormatting.formatText('#@test', options).trim(), - "<p>#<a class='mention-link' href='#' data-mention='test'>@test</a></p>" + '<p>#<span data-mention="test">@test</span></p>' ); assert.equal( |