summaryrefslogtreecommitdiff
path: root/test/web/salmon
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-04-02 16:10:38 +0200
committerlain <lain@soykaf.club>2019-04-02 16:10:38 +0200
commit39bcf93007a5a52ba374099d6b04692361e7fa9b (patch)
tree358becb7f089c62d9f2a2634ca766ee7e7bad3f3 /test/web/salmon
parentfd07745d1b18e2a1eeb88a99eaa9d5e728d1aa71 (diff)
parent180b87257cae481d4d9ffc9f03a06268ad8df569 (diff)
downloadpleroma-39bcf93007a5a52ba374099d6b04692361e7fa9b.tar.gz
pleroma-39bcf93007a5a52ba374099d6b04692361e7fa9b.zip
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
Diffstat (limited to 'test/web/salmon')
-rw-r--r--test/web/salmon/salmon_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index 265e1abbd..35503259b 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -99,7 +99,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
}
{:ok, activity} = Repo.insert(%Activity{data: activity_data, recipients: activity_data["to"]})
- user = Repo.get_by(User, ap_id: activity.data["actor"])
+ user = User.get_by_ap_id(activity.data["actor"])
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
poster = fn url, _data, _headers ->