diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:23:50 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-13 09:23:50 +0300 |
| commit | f00ff20768cbbb6eb5a6442772335dbe60fde6d4 (patch) | |
| tree | 934dba7fb5aa850a3a35b229bd7c6020ca3b2816 /test/web/activity_pub | |
| parent | c556efb761a3e7fc2beb4540d6f58dbfe8e4abfe (diff) | |
| parent | 7ee35eb9a6a55ef610eb02a04a33f67e5921cff3 (diff) | |
| download | pleroma-f00ff20768cbbb6eb5a6442772335dbe60fde6d4.tar.gz pleroma-f00ff20768cbbb6eb5a6442772335dbe60fde6d4.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
# Conflicts:
# lib/pleroma/following_relationship.ex
Diffstat (limited to 'test/web/activity_pub')
| -rw-r--r-- | test/web/activity_pub/transmogrifier_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 1299683fd..2332029e5 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -1618,7 +1618,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do }) user_two = insert(:user) - Pleroma.FollowingRelationship.follow(user_two, user, "accept") + Pleroma.FollowingRelationship.follow(user_two, user, :follow_accept) {:ok, activity} = CommonAPI.post(user, %{"status" => "test"}) {:ok, unrelated_activity} = CommonAPI.post(user_two, %{"status" => "test"}) |