X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=test%2Fformatter_test.exs;h=06f4f6e50d57241d349b17c2805ab7d8860646c1;hb=efa61c161085fd24f7e85ccf7f32ef823e335d7b;hp=fcdf931b7268443d1ef80e22e0aca626a6724191;hpb=20e0f3660541f19cf878b789aa9f5b9d5ce8cddb;p=akkoma
diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index fcdf931b7..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,15 +263,17 @@ 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:"
+ text = "I love :firefox:"
- assert Formatter.get_emoji(text) == [{"moominmamma", "/finmoji/128px/moominmamma-128.png"}]
+ assert Formatter.get_emoji(text) == [
+ {"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"]}
+ ]
end
test "it returns a nice empty result when no emojis are present" do