X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fformatter_test.exs;h=f919738812c696c3b357880cd631cf1e2888364f;hb=c84723b67956f731801c98a1335128d8cdbf9291;hp=1e3a29e09ecc9096d8a064cfa31d58b0875ff59b;hpb=1af9c777365f3b54edcb572cea4e2e6f185b3099;p=akkoma

diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 1e3a29e09..f91973881 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -6,9 +6,23 @@ defmodule Pleroma.FormatterTest do
 
   describe ".linkify" do
     test "turning urls into links" do
-      text = "Hey, check out https://www.youtube.com/watch?v=8Zg1-TufFzY."
+      text = "Hey, check out https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla."
+      expected = "Hey, check out <a href='https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla'>https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla</a>."
 
-      expected = "Hey, check out <a href='https://www.youtube.com/watch?v=8Zg1-TufFzY'>https://www.youtube.com/watch?v=8Zg1-TufFzY</a>."
+      assert Formatter.linkify(text) == expected
+
+      text = "https://mastodon.social/@lambadalambda"
+      expected = "<a href='https://mastodon.social/@lambadalambda'>https://mastodon.social/@lambadalambda</a>"
+
+      assert Formatter.linkify(text) == expected
+
+      text = "@lambadalambda"
+      expected = "@lambadalambda"
+
+      assert Formatter.linkify(text) == expected
+
+      text = "http://www.cs.vu.nl/~ast/intel/"
+      expected = "<a href='http://www.cs.vu.nl/~ast/intel/'>http://www.cs.vu.nl/~ast/intel/</a>"
 
       assert Formatter.linkify(text) == expected
     end
@@ -16,9 +30,9 @@ defmodule Pleroma.FormatterTest do
 
   describe ".parse_tags" do
     test "parses tags in the text" do
-      text = "Here's a #test. Maybe these are #working or not. What about #漢字? And #は｡"
+      text = "Here's a #Test. Maybe these are #working or not. What about #漢字? And #は｡"
       expected = [
-        {"#test", "test"},
+        {"#Test", "test"},
         {"#working", "working"},
         {"#漢字", "漢字"},
         {"#は", "は"}
@@ -43,4 +57,18 @@ defmodule Pleroma.FormatterTest do
 
     assert Formatter.parse_mentions(text) == expected_result
   end
+
+  test "it adds cool emoji" do
+    text = "I love :moominmamma:"
+
+    expected_result = "I love <img height='32px' width='32px' alt='moominmamma' title='moominmamma' src='/finmoji/128px/moominmamma-128.png' />"
+
+    assert Formatter.emojify(text) == expected_result
+  end
+
+  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"}]
+  end
 end