aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-15 18:25:21 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-15 18:25:21 +0200
commit423194520e3fd1d2b285e7cf34a8ad7476276f5d (patch)
tree9dcff3ba5820e5a81d2d089a6fda238d208a9370 /test
parenta0a0d166323e7dabed185eab6e9083a9f73003f3 (diff)
downloadpleroma-423194520e3fd1d2b285e7cf34a8ad7476276f5d.tar.gz
Fix mention replacing.
Diffstat (limited to 'test')
-rw-r--r--test/web/twitter_api/twitter_api_test.exs11
1 files changed, 7 insertions, 4 deletions
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index ebc9e362f..d70ef88f3 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -236,27 +236,30 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
end
test "it can parse mentions and return the relevant users" do
- text = "@gsimg According to @archaeme , that is @daggsy."
+ text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
gsimg = insert(:user, %{nickname: "gsimg"})
archaeme = insert(:user, %{nickname: "archaeme"})
+ archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
expected_result = [
{"@gsimg", gsimg},
- {"@archaeme", archaeme}
+ {"@archaeme", archaeme},
+ {"@archaeme@archae.me", archaeme_remote},
]
assert TwitterAPI.parse_mentions(text) == expected_result
end
test "it adds user links to an existing text" do
- text = "@gsimg According to @archaeme , that is @daggsy."
+ text = "@gsimg According to @archaeme, that is @daggsy. Also hello @archaeme@archae.me"
gsimg = insert(:user, %{nickname: "gsimg"})
archaeme = insert(:user, %{nickname: "archaeme"})
+ archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
mentions = TwitterAPI.parse_mentions(text)
- expected_text = "<a href='#{gsimg.ap_id}'>@gsimg</a> According to <a href='#{archaeme.ap_id}'>@archaeme</a> , that is @daggsy."
+ expected_text = "<a href='#{gsimg.ap_id}'>@gsimg</a> According to <a href='#{archaeme.ap_id}'>@archaeme</a>, that is @daggsy. Also hello <a href='#{archaeme_remote.ap_id}'>@archaeme@archae.me</a>"
assert TwitterAPI.add_user_links(text, mentions) == expected_text
end