summaryrefslogtreecommitdiffstats
path: root/app/import_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2018-07-05 09:08:49 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2018-07-05 09:08:49 -0400
commit6299af0fa54a9cd658e0d7fb1e5552746830cebf (patch)
treeabccd8ed207d00406d7d64b5ae2de44f323fab91 /app/import_test.go
parent7c855c30dbb0326901a9c087bedd7286dafac47f (diff)
downloadchat-6299af0fa54a9cd658e0d7fb1e5552746830cebf.tar.gz
chat-6299af0fa54a9cd658e0d7fb1e5552746830cebf.tar.bz2
chat-6299af0fa54a9cd658e0d7fb1e5552746830cebf.zip
Add ability to bulk import emoji (#9048)
* Add ability to bulk import emoji * Improve error handling * Update test config
Diffstat (limited to 'app/import_test.go')
-rw-r--r--app/import_test.go80
1 files changed, 79 insertions, 1 deletions
diff --git a/app/import_test.go b/app/import_test.go
index e7bc055a4..8a88937f9 100644
--- a/app/import_test.go
+++ b/app/import_test.go
@@ -3774,11 +3774,16 @@ func TestImportBulkImport(t *testing.T) {
th := Setup()
defer th.TearDown()
+ th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableCustomEmoji = true })
+
teamName := model.NewId()
channelName := model.NewId()
username := model.NewId()
username2 := model.NewId()
username3 := model.NewId()
+ emojiName := model.NewId()
+ testsDir, _ := utils.FindDir("tests")
+ testImage := filepath.Join(testsDir, "test.png")
// Run bulk import with a valid 1 of everything.
data1 := `{"type": "version", "version": 1}
@@ -3791,7 +3796,8 @@ func TestImportBulkImport(t *testing.T) {
{"type": "direct_channel", "direct_channel": {"members": ["` + username + `", "` + username2 + `"]}}
{"type": "direct_channel", "direct_channel": {"members": ["` + username + `", "` + username2 + `", "` + username3 + `"]}}
{"type": "direct_post", "direct_post": {"channel_members": ["` + username + `", "` + username2 + `"], "user": "` + username + `", "message": "Hello Direct Channel", "create_at": 123456789013}}
-{"type": "direct_post", "direct_post": {"channel_members": ["` + username + `", "` + username2 + `", "` + username3 + `"], "user": "` + username + `", "message": "Hello Group Channel", "create_at": 123456789014}}`
+{"type": "direct_post", "direct_post": {"channel_members": ["` + username + `", "` + username2 + `", "` + username3 + `"], "user": "` + username + `", "message": "Hello Group Channel", "create_at": 123456789014}}
+{"type": "emoji", "emoji": {"name": "` + emojiName + `", "image": "` + testImage + `"}}`
if err, line := th.App.BulkImport(strings.NewReader(data1), false, 2); err != nil || line != 0 {
t.Fatalf("BulkImport should have succeeded: %v, %v", err.Error(), line)
@@ -3833,3 +3839,75 @@ func TestImportProcessImportDataFileVersionLine(t *testing.T) {
t.Fatalf("Expected error on invalid version line.")
}
}
+
+func TestImportValidateEmojiImportData(t *testing.T) {
+ data := EmojiImportData{
+ Name: ptrStr("parrot"),
+ Image: ptrStr("/path/to/image"),
+ }
+
+ err := validateEmojiImportData(&data)
+ assert.Nil(t, err, "Validation should succeed")
+
+ *data.Name = "smiley"
+ err = validateEmojiImportData(&data)
+ assert.NotNil(t, err)
+
+ *data.Name = ""
+ err = validateEmojiImportData(&data)
+ assert.NotNil(t, err)
+
+ *data.Name = ""
+ *data.Image = ""
+ err = validateEmojiImportData(&data)
+ assert.NotNil(t, err)
+
+ *data.Image = "/path/to/image"
+ data.Name = nil
+ err = validateEmojiImportData(&data)
+ assert.NotNil(t, err)
+
+ data.Name = ptrStr("parrot")
+ data.Image = nil
+ err = validateEmojiImportData(&data)
+ assert.NotNil(t, err)
+}
+
+func TestImportImportEmoji(t *testing.T) {
+ th := Setup()
+ defer th.TearDown()
+
+ th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableCustomEmoji = true })
+
+ testsDir, _ := utils.FindDir("tests")
+ testImage := filepath.Join(testsDir, "test.png")
+
+ data := EmojiImportData{Name: ptrStr(model.NewId())}
+ err := th.App.ImportEmoji(&data, true)
+ assert.NotNil(t, err, "Invalid emoji should have failed dry run")
+
+ result := <-th.App.Srv.Store.Emoji().GetByName(*data.Name)
+ assert.Nil(t, result.Data, "Emoji should not have been imported")
+
+ data.Image = ptrStr(testImage)
+ err = th.App.ImportEmoji(&data, true)
+ assert.Nil(t, err, "Valid emoji should have passed dry run")
+
+ data = EmojiImportData{Name: ptrStr(model.NewId())}
+ err = th.App.ImportEmoji(&data, false)
+ assert.NotNil(t, err, "Invalid emoji should have failed apply mode")
+
+ data.Image = ptrStr("non-existent-file")
+ err = th.App.ImportEmoji(&data, false)
+ assert.NotNil(t, err, "Emoji with bad image file should have failed apply mode")
+
+ data.Image = ptrStr(testImage)
+ err = th.App.ImportEmoji(&data, false)
+ assert.Nil(t, err, "Valid emoji should have succeeded apply mode")
+
+ result = <-th.App.Srv.Store.Emoji().GetByName(*data.Name)
+ assert.NotNil(t, result.Data, "Emoji should have been imported")
+
+ err = th.App.ImportEmoji(&data, false)
+ assert.Nil(t, err, "Second run should have succeeded apply mode")
+}