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

Change user.deactivated field to user.is_active

Browse source
This commit is contained in:
Mark Felder 2020-10-12 17:42:27 -05:00 • committed by Mark Felder
commit 860b5c7804
40 changed files with 125 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
View file

@ -126,7 +126,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
end
test "returns 404 for deactivated user", %{conn: conn} do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
assert %{"error" => "Can't find user"} =
conn
@ -256,7 +256,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
end
test "deactivated user", %{conn: conn} do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
assert %{"error" => "Can't find user"} ==
conn

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

@ -136,7 +136,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do
end
test "it returns 204 when user is deactivated", %{conn: conn, user: user} do
{:ok, user} = Repo.update(Ecto.Changeset.change(user, deactivated: true, local: true))
{:ok, user} = Repo.update(Ecto.Changeset.change(user, is_active: false, local: true))
conn = post(conn, "/auth/password?email=#{user.email}")
assert empty_json_response(conn)

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.deactivated)
{:ok, _user2} = User.deactivate(user2, user2.is_active)
insert(:user, %{local: false, nickname: "u@peer1.com"})
insert(:user, %{local: false, nickname: "u@peer2.com"})

2
test/pleroma/web/mastodon_api/mastodon_api_test.exs
View file

@ -16,7 +16,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do
describe "follow/3" do
test "returns error when followed user is deactivated" do
follower = insert(:user)
user = insert(:user, local: true, deactivated: true)
user = insert(:user, local: true, is_active: false)
assert {:error, _error} = MastodonAPI.follow(follower, user)
end

2
test/pleroma/web/mastodon_api/views/account_view_test.exs
View file

@ -211,7 +211,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
test "Represent a deactivated user for an admin" do
admin = insert(:user, is_admin: true)
deactivated_user = insert(:user, deactivated: true)
deactivated_user = insert(:user, is_active: false)
represented = AccountView.render("show.json", %{user: deactivated_user, for: admin})
assert represented[:pleroma][:deactivated] == true
end