aboutsummaryrefslogtreecommitdiff
path: root/test/web
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-18 11:59:00 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:39:59 +0300
commit160d4e6af6d0a41f3147ddab87d93b4b22bb6571 (patch)
tree7e811fb95985824a9f4927f2d64bf0f540a77a19 /test/web
parent952cb589f47972bba8f9b94b2935a60f05e21bd3 (diff)
downloadpleroma-fix/1604-emoji-path.tar.gz
fix for doubled path on importfix/1604-emoji-path
Diffstat (limited to 'test/web')
-rw-r--r--test/web/pleroma_api/controllers/emoji_api_controller_test.exs10
1 files changed, 8 insertions, 2 deletions
diff --git a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
index 4b9f5cf9a..3d1fa0d94 100644
--- a/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/emoji_api_controller_test.exs
@@ -448,7 +448,12 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
File.rm!("#{@emoji_dir_path}/test_pack_for_import/pack.json")
refute File.exists?("#{@emoji_dir_path}/test_pack_for_import/pack.json")
- emoji_txt_content = "blank, blank.png, Fun\n\nblank2, blank.png"
+ emoji_txt_content = """
+ blank, blank.png, Fun
+ blank2, blank.png
+ foo, /emoji/test_pack_for_import/blank.png
+ bar
+ """
File.write!("#{@emoji_dir_path}/test_pack_for_import/emoji.txt", emoji_txt_content)
@@ -460,7 +465,8 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
assert resp["test_pack_for_import"]["files"] == %{
"blank" => "blank.png",
- "blank2" => "blank.png"
+ "blank2" => "blank.png",
+ "foo" => "blank.png"
}
end
end