diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 20:39:52 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 20:39:52 +0700 |
| commit | fa8483cb808ef4b8b907d7ec0eeb882f3f47d927 (patch) | |
| tree | c710d397bb2c189026eee910ee910384abb8eab9 /test/web/activity_pub | |
| parent | d140738edf75467420b35c500716cf89de66548d (diff) | |
| parent | 180b87257cae481d4d9ffc9f03a06268ad8df569 (diff) | |
| download | pleroma-fa8483cb808ef4b8b907d7ec0eeb882f3f47d927.tar.gz pleroma-fa8483cb808ef4b8b907d7ec0eeb882f3f47d927.zip | |
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/activity_pub_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs index 7969c8035..46b4cf7b6 100644 --- a/test/web/activity_pub/activity_pub_test.exs +++ b/test/web/activity_pub/activity_pub_test.exs @@ -638,8 +638,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do describe "fetch the latest Follow" do test "fetches the latest Follow activity" do %Activity{data: %{"type" => "Follow"}} = activity = insert(:follow_activity) - follower = Repo.get_by(User, ap_id: activity.data["actor"]) - followed = Repo.get_by(User, ap_id: activity.data["object"]) + follower = User.get_by_ap_id(activity.data["actor"]) + followed = User.get_by_ap_id(activity.data["object"]) assert activity == Utils.fetch_latest_follow(follower, followed) end |