Merge branch '1152-deletion' into 'develop'

User deletion issue exploration

See merge request pleroma/pleroma!2879
This commit is contained in:
lain 2020-08-13 09:06:33 +00:00
commit 5be25b3e38

View file

@ -158,6 +158,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
user = insert(:user) user = insert(:user)
clear_config([:instance, :federating], true) clear_config([:instance, :federating], true)
refute user.deactivated
with_mock Pleroma.Web.Federator, with_mock Pleroma.Web.Federator,
publish: fn _ -> nil end do publish: fn _ -> nil end do
conn = conn =
@ -176,6 +178,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert json_response(conn, 200) == [user.nickname] assert json_response(conn, 200) == [user.nickname]
user = Repo.get(User, user.id)
assert user.deactivated
assert called(Pleroma.Web.Federator.publish(:_)) assert called(Pleroma.Web.Federator.publish(:_))
end end
end end