diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-05 15:52:40 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-05 15:52:40 +0000 |
| commit | 3f6da9c45aeb6954a857566731f483cd3da8d068 (patch) | |
| tree | b5ebea21c1fe2348d76ec8c219ea318b703e535e /test/user_test.exs | |
| parent | a511d2f9003870d267c143ee1aa12a0dfd805f8e (diff) | |
| parent | e1370ba1316734f61d8326200df1cb0789a4686f (diff) | |
| download | pleroma-3f6da9c45aeb6954a857566731f483cd3da8d068.tar.gz pleroma-3f6da9c45aeb6954a857566731f483cd3da8d068.zip | |
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
Diffstat (limited to 'test/user_test.exs')
| -rw-r--r-- | test/user_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index 1a82aa6f7..108883ba3 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -75,7 +75,7 @@ defmodule Pleroma.UserTest do Pleroma.Web.TwitterAPI.TwitterAPI.follow(pending_follower, %{"user_id" => locked.id}) Pleroma.Web.TwitterAPI.TwitterAPI.follow(pending_follower, %{"user_id" => locked.id}) Pleroma.Web.TwitterAPI.TwitterAPI.follow(accepted_follower, %{"user_id" => locked.id}) - User.maybe_follow(accepted_follower, locked) + User.follow(accepted_follower, locked) assert {:ok, [activity]} = User.get_follow_requests(locked) assert activity |