diff options
author | Mark Felder <feld@feld.me> | 2021-02-03 16:36:45 -0600 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2021-02-03 16:40:59 -0600 |
commit | 887db076b55764f1cc7757df06f5ff8587de9798 (patch) | |
tree | 62ba6df4e571c5839d030f910229980be2293630 /lib/pleroma | |
parent | a7864a94295eedaee1c2ad0829c9b668c7acd705 (diff) | |
download | pleroma-887db076b55764f1cc7757df06f5ff8587de9798.tar.gz |
Load an emoji.txt specific to the test env
Diffstat (limited to 'lib/pleroma')
-rw-r--r-- | lib/pleroma/emoji/loader.ex | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex index 028cf5ea8..cc25dabf9 100644 --- a/lib/pleroma/emoji/loader.ex +++ b/lib/pleroma/emoji/loader.ex @@ -77,10 +77,19 @@ defmodule Pleroma.Emoji.Loader do # it should run even if there are no emoji packs shortcode_globs = Config.get([:emoji, :shortcode_globs], []) + # for testing emoji.txt entries we do not want exposed in normal operation + test_emoji = + if Mix.env() == :test do + load_from_file("test/config/emoji.txt", emoji_groups) + else + [] + end + emojis_txt = (load_from_file("config/emoji.txt", emoji_groups) ++ load_from_file("config/custom_emoji.txt", emoji_groups) ++ - load_from_globs(shortcode_globs, emoji_groups)) + load_from_globs(shortcode_globs, emoji_groups) ++ + test_emoji) |> Enum.reject(fn value -> value == nil end) Enum.map(emojis ++ emojis_txt, &prepare_emoji/1) |