diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-18 18:31:25 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-18 18:31:25 +0300 |
| commit | 74346a7035d950ede143d65f8364194cb116aaf5 (patch) | |
| tree | f058b3fc2edd6868511bc6f832f75374bdbd117e /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | a38f21f51dc810221cbf910556910a10f6104956 (diff) | |
| parent | 98d9dcd509ab6823e38b3ddbce1f5fc4f3d5a82c (diff) | |
| download | pleroma-74346a7035d950ede143d65f8364194cb116aaf5.tar.gz pleroma-74346a7035d950ede143d65f8364194cb116aaf5.zip | |
Fix merge conflict
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 5f13e7959..e08edc525 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -1357,9 +1357,9 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do assert user.name == "new name" assert user.bio == - "hi <span><a data-user='#{user2.id}' class='mention' href='#{user2.ap_id}'>@<span>#{ - user2.nickname - }</span></a></span>" + "hi <span class='h-card'><a data-user='#{user2.id}' class='u-url mention' href='#{ + user2.ap_id + }'>@<span>#{user2.nickname}</span></a></span>" assert json_response(conn, 200) == UserView.render("user.json", %{user: user, for: user}) end |