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

Merge branch 'develop' into refactor/deactivated_user_field

Browse source
This commit is contained in:
Mark Felder 2021-01-18 14:58:21 -06:00
commit 28581e03ad
107 changed files with 278 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/pleroma/web/o_auth/o_auth_controller_test.exs
View file

@ -928,7 +928,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
{:ok, user} =
insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
|> User.confirmation_changeset(need_confirmation: true)
|> User.confirmation_changeset(set_confirmation: false)
|> User.update_and_set_cache()
refute Pleroma.User.account_status(user) == :active
@ -1013,7 +1013,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
confirmation_pending: true
is_confirmed: false
)
app = insert(:oauth_app, scopes: ["read", "write"])
@ -1041,7 +1041,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
approval_pending: true
is_approved: false
)
refute Pleroma.User.account_status(user) == :active