projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/2438-users-posts-total-count' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
o_auth
/
o_auth_controller_test.exs
diff --git
a/test/pleroma/web/o_auth/o_auth_controller_test.exs
b/test/pleroma/web/o_auth/o_auth_controller_test.exs
index 337d2650ce89b4b71f82a690d0ab6b04f28d1765..312500febf243a04ca96526f9de790513f324a1f 100644
(file)
--- a/
test/pleroma/web/o_auth/o_auth_controller_test.exs
+++ b/
test/pleroma/web/o_auth/o_auth_controller_test.exs
@@
-923,7
+923,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
end
test "rejects token exchange for valid credentials belonging to unconfirmed user and confirmation is required" do
end
test "rejects token exchange for valid credentials belonging to unconfirmed user and confirmation is required" do
-
Pleroma.Config.put
([:instance, :account_activation_required], true)
+
clear_config
([:instance, :account_activation_required], true)
password = "testpassword"
{:ok, user} =
password = "testpassword"
{:ok, user} =
@@
-956,7
+956,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
-
deactivated: tru
e
+
is_active: fals
e
)
app = insert(:oauth_app)
)
app = insert(:oauth_app)
@@
-1007,7
+1007,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
end
test "rejects token exchange for user with confirmation_pending set to true" do
end
test "rejects token exchange for user with confirmation_pending set to true" do
-
Pleroma.Config.put
([:instance, :account_activation_required], true)
+
clear_config
([:instance, :account_activation_required], true)
password = "testpassword"
user =
password = "testpassword"
user =
@@
-1041,7
+1041,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
-
approval_pending: tru
e
+
is_approved: fals
e
)
refute Pleroma.User.account_status(user) == :active
)
refute Pleroma.User.account_status(user) == :active
@@
-1086,7
+1086,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
setup do: clear_config([:oauth2, :issue_new_refresh_token])
test "issues a new access token with keep fresh token" do
setup do: clear_config([:oauth2, :issue_new_refresh_token])
test "issues a new access token with keep fresh token" do
-
Pleroma.Config.put
([:oauth2, :issue_new_refresh_token], true)
+
clear_config
([:oauth2, :issue_new_refresh_token], true)
user = insert(:user)
app = insert(:oauth_app, scopes: ["read", "write"])
user = insert(:user)
app = insert(:oauth_app, scopes: ["read", "write"])
@@
-1125,7
+1125,7
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
end
test "issues a new access token with new fresh token" do
end
test "issues a new access token with new fresh token" do
-
Pleroma.Config.put
([:oauth2, :issue_new_refresh_token], false)
+
clear_config
([:oauth2, :issue_new_refresh_token], false)
user = insert(:user)
app = insert(:oauth_app, scopes: ["read", "write"])
user = insert(:user)
app = insert(:oauth_app, scopes: ["read", "write"])