hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make setting user activation status explicit

Browse source
This commit is contained in:
Mark Felder 2020-10-13 17:16:03 -05:00 • committed by Mark Felder
commit ebd7d1365b
8 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/pleroma/user_test.exs
View file

@ -1313,13 +1313,13 @@ defmodule Pleroma.UserTest do
end
end
describe ".deactivate" do
describe ".set_activation" do
test "can de-activate then re-activate a user" do
user = insert(:user)
assert user.is_active
{:ok, user} = User.deactivate(user)
{:ok, user} = User.set_activation(user, false)
refute user.is_active
{:ok, user} = User.deactivate(user, false)
{:ok, user} = User.set_activation(user, true)
assert user.is_active
end
@ -1328,7 +1328,7 @@ defmodule Pleroma.UserTest do
user2 = insert(:user)
{:ok, user, user2} = User.follow(user, user2)
{:ok, _user} = User.deactivate(user)
{:ok, _user} = User.set_activation(user, false)
user2 = User.get_cached_by_id(user2.id)
@ -1344,7 +1344,7 @@ defmodule Pleroma.UserTest do
assert user2.following_count == 1
assert User.following_count(user2) == 1
{:ok, _user} = User.deactivate(user)
{:ok, _user} = User.set_activation(user, false)
user2 = User.get_cached_by_id(user2.id)
@ -1374,7 +1374,7 @@ defmodule Pleroma.UserTest do
user: user2
})
{:ok, _user} = User.deactivate(user)
{:ok, _user} = User.set_activation(user, false)
assert [] == ActivityPub.fetch_public_activities(%{})
assert [] == Pleroma.Notification.for_user(user2)

2
test/pleroma/web/admin_api/controllers/user_controller_test.exs
View file

@ -940,7 +940,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
assert json_response(conn, 200) ==
user_response(
user,
%{"is_active" => user.is_active}
%{"is_active" => !user.is_active}
)
log_entry = Repo.one(ModerationLog)

2
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
View file

@ -57,7 +57,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
user = insert(:user, %{local: true})
user2 = insert(:user, %{local: true})
{:ok, _user2} = User.deactivate(user2, user2.is_active)
{:ok, _user2} = User.set_activation(user2, false)
insert(:user, %{local: false, nickname: "u@peer1.com"})
insert(:user, %{local: false, nickname: "u@peer2.com"})