From 948b557453550646ad3213cb4144055eb7db0d69 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 3 Feb 2017 14:21:10 -0500
Subject: Partially reverted 7e9cf13aa356f991f48ba0a943bdab9b4d3c9233 (#5295)

---
 webapp/client/test_web_client.jsx | 7 -------
 webapp/stores/emoji_store.jsx     | 4 ++--
 webapp/webpack.config.js          | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 webapp/client/test_web_client.jsx

diff --git a/webapp/client/test_web_client.jsx b/webapp/client/test_web_client.jsx
deleted file mode 100644
index ac8055f9e..000000000
--- a/webapp/client/test_web_client.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import Client from './client.jsx';
-
-var WebClient = new Client();
-export default WebClient;
diff --git a/webapp/stores/emoji_store.jsx b/webapp/stores/emoji_store.jsx
index 212583ea8..a178ff6ae 100644
--- a/webapp/stores/emoji_store.jsx
+++ b/webapp/stores/emoji_store.jsx
@@ -1,7 +1,6 @@
 // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import Client from '../client/web_client.jsx';
 import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 import Constants from 'utils/constants.jsx';
 import EventEmitter from 'events';
@@ -149,7 +148,8 @@ class EmojiStore extends EventEmitter {
 
     getEmojiImageUrl(emoji) {
         if (emoji.id) {
-            return Client.getCustomEmojiImageUrl(emoji.id);
+            // must match Client.getCustomEmojiImageUrl
+            return `/api/v3/emoji/${emoji.id}`;
         }
 
         const filename = emoji.filename || emoji.aliases[0];
diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js
index ecd2230c4..f1742e3ae 100644
--- a/webapp/webpack.config.js
+++ b/webapp/webpack.config.js
@@ -159,7 +159,6 @@ if (TEST) {
     config.entry = ['babel-polyfill', './root.jsx'];
     config.target = 'node';
     config.externals = [nodeExternals()];
-    config.resolve.alias['./client/web_client.jsx'] = path.resolve(__dirname, 'client/test_web_client.jsx');
 } else {
     // For some reason these break mocha. So they go here.
     config.plugins.push(
-- 
cgit v1.2.3-1-g7c22