projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
test
/
pleroma
/
web
/
twitter_api
/
remote_follow_controller_test.exs
diff --git
a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs
index dfe5b02bed67811a17cebf426c129b9389fd4fdd..f389c272bc0aad4faa4e418a700cf31e84f9c9df 100644
(file)
--- a/
test/pleroma/web/twitter_api/remote_follow_controller_test.exs
+++ b/
test/pleroma/web/twitter_api/remote_follow_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
@@
-141,7
+141,7
@@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
end
test "returns error when user is deactivated", %{conn: conn} do
end
test "returns error when user is deactivated", %{conn: conn} do
- user = insert(:user,
deactivated: tru
e)
+ user = insert(:user,
is_active: fals
e)
user2 = insert(:user)
response =
user2 = insert(:user)
response =
@@
-154,7
+154,7
@@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
end
test "returns error when user is blocked", %{conn: conn} do
end
test "returns error when user is blocked", %{conn: conn} do
-
Pleroma.Config.put
([:user, :deny_follow_blocked], true)
+
clear_config
([:user, :deny_follow_blocked], true)
user = insert(:user)
user2 = insert(:user)
user = insert(:user)
user2 = insert(:user)
@@
-365,7
+365,7
@@
defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
end
test "returns error when user is blocked", %{conn: conn} do
end
test "returns error when user is blocked", %{conn: conn} do
-
Pleroma.Config.put
([:user, :deny_follow_blocked], true)
+
clear_config
([:user, :deny_follow_blocked], true)
user = insert(:user)
user2 = insert(:user)
{:ok, _user_block} = Pleroma.User.block(user2, user)
user = insert(:user)
user2 = insert(:user)
{:ok, _user_block} = Pleroma.User.block(user2, user)