diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
| commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
| tree | c0d68f476442b8dd86fca1e182d5c09553800810 /test/web/mastodon_api/status_view_test.exs | |
| parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
| parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
| download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.zip | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'test/web/mastodon_api/status_view_test.exs')
| -rw-r--r-- | test/web/mastodon_api/status_view_test.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs index 93c0b7236..0d396f3b8 100644 --- a/test/web/mastodon_api/status_view_test.exs +++ b/test/web/mastodon_api/status_view_test.exs @@ -56,7 +56,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do test "contains mentions" do incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml") - user = insert(:user, %{ap_id: "https://pleroma.soykaf.com/users/lain"}) + # a user with this ap id might be in the cache. + recipient = "https://pleroma.soykaf.com/users/lain" + user = User.get_cached_by_ap_id(recipient) || insert(:user, %{ap_id: recipient}) {:ok, [activity]} = OStatus.handle_incoming(incoming) |