diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-04 23:43:08 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-04 23:43:08 +0300 |
| commit | 45765918c377c6daf8ee8e5bfad4ea24f67766b6 (patch) | |
| tree | a8ccea9436d7c533a481939a4724c62d8ffac4c0 /test/web/salmon | |
| parent | f7cd9131d4aa0da3c4c0174acc56ce1bbdbd284c (diff) | |
| parent | 9c9eec62c2fb67507708dd9e5d3f80a098881a6e (diff) | |
| download | pleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.tar.gz pleroma-45765918c377c6daf8ee8e5bfad4ea24f67766b6.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Diffstat (limited to 'test/web/salmon')
| -rw-r--r-- | test/web/salmon/salmon_test.exs | 2 |
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 -> |