X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fformatter_test.exs;h=06f4f6e50d57241d349b17c2805ab7d8860646c1;hb=107c83ab2b186c951dc27140908d414a202119d8;hp=38430e1700337158ed85edc3e3c8394bc7d053b0;hpb=17d3d05a7196140b62dd791af8d7ced8b0ad9fa1;p=akkoma
diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 38430e170..06f4f6e50 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -147,7 +147,7 @@ defmodule Pleroma.FormatterTest do
end
test "gives a replacement for user links when the user is using Osada" do
- mike = User.get_or_fetch("mike@osada.macgirvin.com")
+ {:ok, mike} = User.get_or_fetch("mike@osada.macgirvin.com")
text = "@mike@osada.macgirvin.com test"
@@ -245,10 +245,10 @@ defmodule Pleroma.FormatterTest do
end
test "it adds cool emoji" do
- text = "I love :moominmamma:"
+ text = "I love :firefox:"
expected_result =
- "I love
"
+ "I love
"
assert Formatter.emojify(text) == expected_result
end
@@ -263,18 +263,16 @@ defmodule Pleroma.FormatterTest do
}
expected_result =
- "I love
"
+ "I love
"
assert Formatter.emojify(text, custom_emoji) == expected_result
end
test "it returns the emoji used in the text" do
- text = "I love :moominmamma:"
-
- tag = Keyword.get(Application.get_env(:pleroma, :emoji), :finmoji_tag)
+ text = "I love :firefox:"
assert Formatter.get_emoji(text) == [
- {"moominmamma", "/finmoji/128px/moominmamma-128.png", tag}
+ {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"]}
]
end