diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:41:31 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-23 22:41:31 +0000 |
| commit | 19263f30c3819f922586b537467e888574c334d7 (patch) | |
| tree | e9c7a490b7ed245cf854c072aae932eb54fd38e8 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
| parent | 760df67a7b767d113a0ff2b351f872caf8751832 (diff) | |
| parent | ae1d371428e16b738b8ec638e411e5e8c1ac4937 (diff) | |
| download | pleroma-19263f30c3819f922586b537467e888574c334d7.tar.gz pleroma-19263f30c3819f922586b537467e888574c334d7.zip | |
Merge branch 'support-rel-ugc' into 'develop'
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index 51f5215c2..73a3bf135 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1014,9 +1014,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 @@ -1036,9 +1036,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 |