From c3d536c644f102cbdc07354aa2ecf8bc8194882e Mon Sep 17 00:00:00 2001
From: S4KH <kh.syerikjan@gmail.com>
Date: Fri, 19 Oct 2018 04:07:21 +0800
Subject: GH-9619 GetEmojiImage added to plugin API (#9628)

* GH-9619 conflict fix

* GH-9619 fixed conflicts, version comment
---
 plugin/plugintest/api.go | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'plugin/plugintest')

diff --git a/plugin/plugintest/api.go b/plugin/plugintest/api.go
index 00328d155..b3df3616f 100644
--- a/plugin/plugintest/api.go
+++ b/plugin/plugintest/api.go
@@ -549,6 +549,38 @@ func (_m *API) GetEmojiByName(name string) (*model.Emoji, *model.AppError) {
 	return r0, r1
 }
 
+// GetEmojiImage provides a mock function with given fields: emojiId
+func (_m *API) GetEmojiImage(emojiId string) ([]byte, string, *model.AppError) {
+	ret := _m.Called(emojiId)
+
+	var r0 []byte
+	if rf, ok := ret.Get(0).(func(string) []byte); ok {
+		r0 = rf(emojiId)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([]byte)
+		}
+	}
+
+	var r1 string
+	if rf, ok := ret.Get(1).(func(string) string); ok {
+		r1 = rf(emojiId)
+	} else {
+		r1 = ret.Get(1).(string)
+	}
+
+	var r2 *model.AppError
+	if rf, ok := ret.Get(2).(func(string) *model.AppError); ok {
+		r2 = rf(emojiId)
+	} else {
+		if ret.Get(2) != nil {
+			r2 = ret.Get(2).(*model.AppError)
+		}
+	}
+
+	return r0, r1, r2
+}
+
 // GetFileInfo provides a mock function with given fields: fileId
 func (_m *API) GetFileInfo(fileId string) (*model.FileInfo, *model.AppError) {
 	ret := _m.Called(fileId)
-- 
cgit v1.2.3-1-g7c22