diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
commit | 61180ab6f4b85ab78de2eaf1bc1b974c9e7908af (patch) | |
tree | 0970691b2060e06b6feaf4e645021298a7efda0d /test/tasks/emoji_test.exs | |
parent | 0e23138b50f1fdd9ea78df31eec1b3caac905e2c (diff) | |
parent | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff) | |
download | pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.tar.gz pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'test/tasks/emoji_test.exs')
-rw-r--r-- | test/tasks/emoji_test.exs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/tasks/emoji_test.exs b/test/tasks/emoji_test.exs index f5de3ef0e..499f098c2 100644 --- a/test/tasks/emoji_test.exs +++ b/test/tasks/emoji_test.exs @@ -73,6 +73,19 @@ defmodule Mix.Tasks.Pleroma.EmojiTest do on_exit(fn -> File.rm_rf!("test/instance_static/emoji/finmoji") end) end + test "install local emoji pack" do + assert capture_io(fn -> + Emoji.run([ + "get-packs", + "local", + "--manifest", + "test/instance_static/local_pack/manifest.json" + ]) + end) =~ "Writing pack.json for" + + on_exit(fn -> File.rm_rf!("test/instance_static/emoji/local") end) + end + test "pack not found" do mock(fn %{ |