diff options
author | lain <lain@soykaf.club> | 2019-05-31 19:08:14 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-05-31 19:08:14 +0200 |
commit | e2c72e53906a75f4a69a312129aa644c3a2fcd39 (patch) | |
tree | 01ebea44c66851c8a052cb24f1cf760035663bb6 /test/web/mastodon_api | |
parent | 3591b7c1529be2703b7dfbb1f88390e596e11ef9 (diff) | |
parent | f061d551a97ed35114ee47c3baf61cf7c376983d (diff) | |
download | pleroma-0.9.99999.tar.gz |
Merge branch 'hotfix-0.9.99999'v0.9.99999
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 2 | ||||
-rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index f8da86004..9daa26410 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -1461,7 +1461,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert user = json_response(conn, 200) assert user["note"] == - "I drink <a class=\"hashtag\" data-tag=\"cofe\" href=\"http://localhost:4001/tag/cofe\">#cofe</a> with <span class=\"h-card\"><a data-user=\"#{ + "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 }\" class=\"u-url mention\" href=\"#{user2.ap_id}\">@<span>#{user2.nickname}</span></a></span>" end diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index 9249424cd..a4d054486 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -94,7 +94,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do card: nil, reblog: nil, content: - "cool test :firefox: <a class=\"hashtag\" data-tag=\"yeah\" href=\"http://localhost:4001/tag/yeah\">#yeah</a>", + "cool test :firefox: <a class=\"hashtag\" data-tag=\"yeah\" href=\"http://localhost:4001/tag/yeah\" rel=\"tag\">#yeah</a>", created_at: created_at, reblogs_count: 0, replies_count: 0, |