projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-attachment-dimensions' 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 bf47afed820cf05a39562b9298784fe302b223a7..0fdd5b8e9fb853e6cd2f4a84ef6eb1ad39030292 100644
(file)
--- a/
test/pleroma/web/o_auth/o_auth_controller_test.exs
+++ b/
test/pleroma/web/o_auth/o_auth_controller_test.exs
@@
-805,10
+805,12
@@
defmodule Pleroma.Web.OAuth.OAuthControllerTest do
"client_secret" => app.client_secret
})
"client_secret" => app.client_secret
})
- assert %{"
access_token" =>
token} = json_response(conn, 200)
+ assert %{"
id" => id, "access_token" => access_
token} = json_response(conn, 200)
- token = Repo.get_by(Token, token: token)
+ token = Repo.get_by(Token, token:
access_
token)
assert token
assert token
+ assert token.id == id
+ assert token.token == access_token
assert token.scopes == app.scopes
end
assert token.scopes == app.scopes
end
@@
-923,12
+925,12
@@
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} =
insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
password = "testpassword"
{:ok, user} =
insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
- |> User.confirmation_changeset(
need_confirmation: tru
e)
+ |> User.confirmation_changeset(
set_confirmation: fals
e)
|> User.update_and_set_cache()
refute Pleroma.User.account_status(user) == :active
|> User.update_and_set_cache()
refute Pleroma.User.account_status(user) == :active
@@
-956,7
+958,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,13
+1009,13
@@
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 =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
password = "testpassword"
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
-
confirmation_pending: tru
e
+
is_confirmed: fals
e
)
app = insert(:oauth_app, scopes: ["read", "write"])
)
app = insert(:oauth_app, scopes: ["read", "write"])
@@
-1041,7
+1043,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
+1088,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
+1127,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"])