diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/formatter_test.exs | 18 | ||||
-rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 18 |
2 files changed, 19 insertions, 17 deletions
diff --git a/test/formatter_test.exs b/test/formatter_test.exs index bf09b246f..1e3a29e09 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -2,6 +2,8 @@ defmodule Pleroma.FormatterTest do alias Pleroma.Formatter use Pleroma.DataCase + import Pleroma.Factory + describe ".linkify" do test "turning urls into links" do text = "Hey, check out https://www.youtube.com/watch?v=8Zg1-TufFzY." @@ -25,4 +27,20 @@ defmodule Pleroma.FormatterTest do assert Formatter.parse_tags(text) == expected end end + + test "it can parse mentions and return the relevant users" do + 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@archae.me", archaeme_remote}, + ] + + assert Formatter.parse_mentions(text) == expected_result + end end diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index d5a1fa57a..da880e67c 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -240,22 +240,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert is_binary(response) end - test "it can parse mentions and return the relevant users" do - 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@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. Also hello @archaeme@archae.me" @@ -263,7 +247,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do archaeme = insert(:user, %{nickname: "archaeme"}) archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"}) - mentions = TwitterAPI.parse_mentions(text) + mentions = Pleroma.Formatter.parse_mentions(text) 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</a>" assert Utils.add_user_links(text, mentions) == expected_text |