projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users...
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
follow_request_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/follow_request_controller_test.exs
b/test/web/mastodon_api/controllers/follow_request_controller_test.exs
index 44e12d15a99f206ef54eda83013dfe4006eae605..6749e0e83a480dcf843b2348735cc2b3bc9e6a4c 100644
(file)
--- a/
test/web/mastodon_api/controllers/follow_request_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/follow_request_controller_test.exs
@@
-6,7
+6,7
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestControllerTest do
use Pleroma.Web.ConnCase
alias Pleroma.User
use Pleroma.Web.ConnCase
alias Pleroma.User
- alias Pleroma.Web.
ActivityPub.ActivityPub
+ alias Pleroma.Web.
CommonAPI
import Pleroma.Factory
import Pleroma.Factory
@@
-20,7
+20,7
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestControllerTest do
test "/api/v1/follow_requests works", %{user: user, conn: conn} do
other_user = insert(:user)
test "/api/v1/follow_requests works", %{user: user, conn: conn} do
other_user = insert(:user)
- {:ok, _
activity} = ActivityPub
.follow(other_user, user)
+ {:ok, _
, _, _activity} = CommonAPI
.follow(other_user, user)
{:ok, other_user} = User.follow(other_user, user, :follow_pending)
assert User.following?(other_user, user) == false
{:ok, other_user} = User.follow(other_user, user, :follow_pending)
assert User.following?(other_user, user) == false
@@
-34,7
+34,7
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestControllerTest do
test "/api/v1/follow_requests/:id/authorize works", %{user: user, conn: conn} do
other_user = insert(:user)
test "/api/v1/follow_requests/:id/authorize works", %{user: user, conn: conn} do
other_user = insert(:user)
- {:ok, _
activity} = ActivityPub
.follow(other_user, user)
+ {:ok, _
, _, _activity} = CommonAPI
.follow(other_user, user)
{:ok, other_user} = User.follow(other_user, user, :follow_pending)
user = User.get_cached_by_id(user.id)
{:ok, other_user} = User.follow(other_user, user, :follow_pending)
user = User.get_cached_by_id(user.id)
@@
-56,7
+56,7
@@
defmodule Pleroma.Web.MastodonAPI.FollowRequestControllerTest do
test "/api/v1/follow_requests/:id/reject works", %{user: user, conn: conn} do
other_user = insert(:user)
test "/api/v1/follow_requests/:id/reject works", %{user: user, conn: conn} do
other_user = insert(:user)
- {:ok, _
activity} = ActivityPub
.follow(other_user, user)
+ {:ok, _
, _, _activity} = CommonAPI
.follow(other_user, user)
user = User.get_cached_by_id(user.id)
user = User.get_cached_by_id(user.id)