From d49419776de0811732db59eae90c5c6da223f076 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 25 Jul 2017 11:47:03 -0700
Subject: Refresh the emoji library (#7001)

* refresh the emoji library

* fix img_trans.gif

* compress sprite sheet

* remove note on compression - webpack seems to handle compression decently

* better emoji sheet preloading

* requested changes
---
 webapp/tests/utils/formatting_hashtags.test.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webapp/tests/utils')

diff --git a/webapp/tests/utils/formatting_hashtags.test.jsx b/webapp/tests/utils/formatting_hashtags.test.jsx
index cba7322ff..ee18a7769 100644
--- a/webapp/tests/utils/formatting_hashtags.test.jsx
+++ b/webapp/tests/utils/formatting_hashtags.test.jsx
@@ -184,8 +184,8 @@ describe('TextFormatting.Hashtags', function() {
         );
 
         assert.equal(
-            TextFormatting.formatText('#:taco:').trim(),
-            '<p>#<span alt=":taco:" class="emoticon" title=":taco:" style="background-image:url(/static/emoji/taco.png)"></span></p>'
+            TextFormatting.formatText('#:mattermost:').trim(),
+            '<p>#<span alt=":mattermost:" class="emoticon" title=":mattermost:" style="background-image:url(/static/emoji/mattermost.png)"></span></p>'
         );
 
         assert.equal(
-- 
cgit v1.2.3-1-g7c22