diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/formatter_test.exs | 30 | ||||
| -rw-r--r-- | test/user_test.exs | 4 | ||||
| -rw-r--r-- | test/web/common_api/common_api_utils_test.exs | 4 | ||||
| -rw-r--r-- | test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs | 7 | ||||
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 8 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 4 | 
6 files changed, 32 insertions, 25 deletions
| diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 3674577d6..2e4280fc2 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -19,7 +19,7 @@ defmodule Pleroma.FormatterTest do        text = "I love #cofe and #2hu"        expected_text = -        "I love <a class='hashtag' data-tag='cofe' href='http://localhost:4001/tag/cofe' rel='tag'>#cofe</a> and <a class='hashtag' data-tag='2hu' href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a>" +        ~s(I love <a class="hashtag" data-tag="cofe" href="http://localhost:4001/tag/cofe" rel="tag ugc">#cofe</a> and <a class="hashtag" data-tag="2hu" href="http://localhost:4001/tag/2hu" rel="tag ugc">#2hu</a>)        assert {^expected_text, [], _tags} = Formatter.linkify(text)      end @@ -28,7 +28,7 @@ defmodule Pleroma.FormatterTest do        text = "#fact_3: pleroma does what mastodon't"        expected_text = -        "<a class='hashtag' data-tag='fact_3' href='http://localhost:4001/tag/fact_3' rel='tag'>#fact_3</a>: pleroma does what mastodon't" +        ~s(<a class="hashtag" data-tag="fact_3" href="http://localhost:4001/tag/fact_3" rel="tag ugc">#fact_3</a>: pleroma does what mastodon't)        assert {^expected_text, [], _tags} = Formatter.linkify(text)      end @@ -137,13 +137,13 @@ defmodule Pleroma.FormatterTest do        assert length(mentions) == 3        expected_text = -        "<span class='h-card'><a data-user='#{gsimg.id}' class='u-url mention' href='#{ +        ~s(<span class="h-card"><a data-user="#{gsimg.id}" class="u-url mention" href="#{            gsimg.ap_id -        }'>@<span>gsimg</span></a></span> According to <span class='h-card'><a data-user='#{ +        }" rel="ugc">@<span>gsimg</span></a></span> According to <span class="h-card"><a data-user="#{            archaeme.id -        }' class='u-url mention' href='#{"https://archeme/@archa_eme_"}'>@<span>archa_eme_</span></a></span>, that is @daggsy. Also hello <span class='h-card'><a data-user='#{ +        }" class="u-url mention" href="#{"https://archeme/@archa_eme_"}" rel="ugc">@<span>archa_eme_</span></a></span>, that is @daggsy. Also hello <span class="h-card"><a data-user="#{            archaeme_remote.id -        }' class='u-url mention' href='#{archaeme_remote.ap_id}'>@<span>archaeme</span></a></span>" +        }" class="u-url mention" href="#{archaeme_remote.ap_id}" rel="ugc">@<span>archaeme</span></a></span>)        assert expected_text == text      end @@ -158,7 +158,9 @@ defmodule Pleroma.FormatterTest do        assert length(mentions) == 1        expected_text = -        "<span class='h-card'><a data-user='#{mike.id}' class='u-url mention' href='#{mike.ap_id}'>@<span>mike</span></a></span> test" +        ~s(<span class="h-card"><a data-user="#{mike.id}" class="u-url mention" href="#{ +          mike.ap_id +        }" rel="ugc">@<span>mike</span></a></span> test)        assert expected_text == text      end @@ -172,7 +174,7 @@ defmodule Pleroma.FormatterTest do        assert length(mentions) == 1        expected_text = -        "<span class='h-card'><a data-user='#{o.id}' class='u-url mention' href='#{o.ap_id}'>@<span>o</span></a></span> hi" +        ~s(<span class="h-card"><a data-user="#{o.id}" class="u-url mention" href="#{o.ap_id}" rel="ugc">@<span>o</span></a></span> hi)        assert expected_text == text      end @@ -194,13 +196,17 @@ defmodule Pleroma.FormatterTest do        assert mentions == [{"@#{user.nickname}", user}, {"@#{other_user.nickname}", other_user}]        assert expected_text == -               "<span class='h-card'><a data-user='#{user.id}' class='u-url mention' href='#{ +               ~s(<span class="h-card"><a data-user="#{user.id}" class="u-url mention" href="#{                   user.ap_id -               }'>@<span>#{user.nickname}</span></a></span> <span class='h-card'><a data-user='#{ +               }" rel="ugc">@<span>#{user.nickname}</span></a></span> <span class="h-card"><a data-user="#{                   other_user.id -               }' class='u-url mention' href='#{other_user.ap_id}'>@<span>#{other_user.nickname}</span></a></span> hey dudes i hate <span class='h-card'><a data-user='#{ +               }" class="u-url mention" href="#{other_user.ap_id}" rel="ugc">@<span>#{ +                 other_user.nickname +               }</span></a></span> hey dudes i hate <span class="h-card"><a data-user="#{                   third_user.id -               }' class='u-url mention' href='#{third_user.ap_id}'>@<span>#{third_user.nickname}</span></a></span>" +               }" class="u-url mention" href="#{third_user.ap_id}" rel="ugc">@<span>#{ +                 third_user.nickname +               }</span></a></span>)      end      test "given the 'safe_mention' option, it will still work without any mention" do diff --git a/test/user_test.exs b/test/user_test.exs index 39ba69668..6852fcd40 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -1294,9 +1294,9 @@ defmodule Pleroma.UserTest do        bio = "A.k.a. @nick@domain.com"        expected_text = -        "A.k.a. <span class='h-card'><a data-user='#{remote_user.id}' class='u-url mention' href='#{ +        ~s(A.k.a. <span class="h-card"><a data-user="#{remote_user.id}" class="u-url mention" href="#{            remote_user.ap_id -        }'>@<span>nick@domain.com</span></a></span>" +        }" rel="ugc">@<span>nick@domain.com</span></a></span>)        assert expected_text == User.parse_bio(bio, user)      end diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs index 78cfe3c5f..2588898d0 100644 --- a/test/web/common_api/common_api_utils_test.exs +++ b/test/web/common_api/common_api_utils_test.exs @@ -159,9 +159,9 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do        expected =          ~s(<p><strong>hello world</strong></p>\n<p><em>another <span class="h-card"><a data-user="#{            user.id -        }" class="u-url mention" href="http://foo.com/user__test">@<span>user__test</span></a></span> and <span class="h-card"><a data-user="#{ +        }" class="u-url mention" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> and <span class="h-card"><a data-user="#{            user.id -        }" class="u-url mention" href="http://foo.com/user__test">@<span>user__test</span></a></span> <a href="http://google.com" rel="ugc">google.com</a> paragraph</em></p>\n) +        }" class="u-url mention" href="http://foo.com/user__test" rel="ugc">@<span>user__test</span></a></span> <a href="http://google.com" rel="ugc">google.com</a> paragraph</em></p>\n)        {output, _, _} = Utils.format_input(text, "text/markdown") diff --git a/test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs b/test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs index 1e8d0d03b..560f55137 100644 --- a/test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs +++ b/test/web/mastodon_api/controllers/mastodon_api_controller/update_credentials_test.exs @@ -86,10 +86,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do        assert user = json_response(conn, 200)        assert user["note"] == -               ~s(I drink <a class="hashtag" data-tag="cofe" href="http://localhost:4001/tag/cofe" rel="tag">#cofe</a> with <span class="h-card"><a data-user=") <> -                 user2.id <> -                 ~s(" class="u-url mention" href=") <> -                 user2.ap_id <> ~s(">@<span>) <> user2.nickname <> ~s(</span></a></span>) +               ~s(I drink <a class="hashtag" data-tag="cofe" href="http://localhost:4001/tag/cofe">#cofe</a> with <span class="h-card"><a data-user="#{ +                 user2.id +               }" class="u-url mention" href="#{user2.ap_id}" rel="ugc">@<span>#{user2.nickname}</span></a></span>)      end      test "updates the user's locking status", %{conn: conn} do diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index fb04748bb..b85f3e758 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -996,9 +996,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do          |> get("/api/v1/notifications")        expected_response = -        "hi <span class=\"h-card\"><a data-user=\"#{user.id}\" class=\"u-url mention\" href=\"#{ +        ~s(hi <span class="h-card"><a data-user="#{user.id}" class="u-url mention" href="#{            user.ap_id -        }\">@<span>#{user.nickname}</span></a></span>" +        }" rel="ugc">@<span>#{user.nickname}</span></a></span>)        assert [%{"status" => %{"content" => response}} | _rest] = json_response(conn, 200)        assert response == expected_response @@ -1018,9 +1018,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do          |> get("/api/v1/notifications/#{notification.id}")        expected_response = -        "hi <span class=\"h-card\"><a data-user=\"#{user.id}\" class=\"u-url mention\" href=\"#{ +        ~s(hi <span class="h-card"><a data-user="#{user.id}" class="u-url mention" href="#{            user.ap_id -        }\">@<span>#{user.nickname}</span></a></span>" +        }" rel="ugc">@<span>#{user.nickname}</span></a></span>)        assert %{"status" => %{"content" => response}} = json_response(conn, 200)        assert response == expected_response diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 08f264431..bf1e233f5 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -109,7 +109,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do      {:ok, user2} = TwitterAPI.register_user(data2)      expected_text = -      "<span class='h-card'><a data-user='#{user1.id}' class='u-url mention' href='#{user1.ap_id}'>@<span>john</span></a></span> test" +      ~s(<span class="h-card"><a data-user="#{user1.id}" class="u-url mention" href="#{ +        user1.ap_id +      }" rel="ugc">@<span>john</span></a></span> test)      assert user2.bio == expected_text    end | 
