diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
commit | 9abf832b034bf3867272bd178d168c641129eff0 (patch) | |
tree | decc2cc28908a79df003ad668fb06cb74fa97159 /test/formatter_test.exs | |
parent | c3d5c3513a3205313f0a2e28bb328ad5b48f2055 (diff) | |
parent | e19590c93f9adc5d743867b048aad9528810fc53 (diff) | |
download | pleroma-9abf832b034bf3867272bd178d168c641129eff0.tar.gz pleroma-9abf832b034bf3867272bd178d168c641129eff0.zip |
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'test/formatter_test.exs')
-rw-r--r-- | test/formatter_test.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs index fcdf931b7..e74985c4e 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -271,7 +271,9 @@ defmodule Pleroma.FormatterTest do test "it returns the emoji used in the text" do text = "I love :moominmamma:" - assert Formatter.get_emoji(text) == [{"moominmamma", "/finmoji/128px/moominmamma-128.png"}] + assert Formatter.get_emoji(text) == [ + {"moominmamma", "/finmoji/128px/moominmamma-128.png", "Finmoji"} + ] end test "it returns a nice empty result when no emojis are present" do |