summaryrefslogtreecommitdiff
path: root/test/formatter_test.exs
diff options
context:
space:
mode:
authorFrancis Dinh <normandy@firemail.cc>2018-05-20 19:17:15 -0400
committerFrancis Dinh <normandy@firemail.cc>2018-05-20 19:17:15 -0400
commit1afd6d37bd2febb58ee09d273b9c7d690022d3c3 (patch)
tree8be53801457cae7e31f7efdb501b81974ca3b36f /test/formatter_test.exs
parentd46393f6efd6475bb20b6a12a7c6ebf800f6c5b5 (diff)
parent961f1312571843209487cc1caa9355fa6552d965 (diff)
downloadpleroma-1afd6d37bd2febb58ee09d273b9c7d690022d3c3.tar.gz
pleroma-1afd6d37bd2febb58ee09d273b9c7d690022d3c3.zip
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
Fixed some conflicts in transmogrifier.ex
Diffstat (limited to 'test/formatter_test.exs')
-rw-r--r--test/formatter_test.exs7
1 files changed, 7 insertions, 0 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index 2cf1f3f8e..e89b36663 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -78,6 +78,13 @@ defmodule Pleroma.FormatterTest do
"<a href=\"https://en.wikipedia.org/wiki/Duff&#39;s_device\">https://en.wikipedia.org/wiki/Duff&#39;s_device</a>"
assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+
+ text = "https://pleroma.com https://pleroma.com/sucks"
+
+ expected =
+ "<a href=\"https://pleroma.com\">https://pleroma.com</a> <a href=\"https://pleroma.com/sucks\">https://pleroma.com/sucks</a>"
+
+ assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
end
end