summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-22 12:48:56 +0100
committerlain <lain@soykaf.club>2018-03-22 12:48:56 +0100
commitb72a25f5b1ce18698b1b3aff6487157898dc7846 (patch)
tree79b97d7f89842ef1d28a334d829e84b1d0c7f429 /test/web/mastodon_api
parent3fcdfb75d03efa27903ba5fdd5c78f2b93a4d55b (diff)
parent32ae9188430349e22721b81baec825b3cebfe8e5 (diff)
downloadpleroma-b72a25f5b1ce18698b1b3aff6487157898dc7846.tar.gz
pleroma-b72a25f5b1ce18698b1b3aff6487157898dc7846.zip
Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpoints
Diffstat (limited to 'test/web/mastodon_api')
-rw-r--r--test/web/mastodon_api/status_view_test.exs5
1 files changed, 1 insertions, 4 deletions
diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs
index 9e2bc3c18..a58f729a6 100644
--- a/test/web/mastodon_api/status_view_test.exs
+++ b/test/web/mastodon_api/status_view_test.exs
@@ -58,10 +58,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
incoming = File.read!("test/fixtures/incoming_reply_mastodon.xml")
# 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})
-
- # invalidate the cache
- User.invalidate_cache(user)
+ user = insert(:user, %{ap_id: recipient})
{:ok, [activity]} = OStatus.handle_incoming(incoming)