projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
[akkoma]
/
test
/
web
/
twitter_api
/
password_controller_test.exs
diff --git
a/test/web/twitter_api/password_controller_test.exs
b/test/web/twitter_api/password_controller_test.exs
index 29ba7d2653a951b581284b24636042110419e2e5..a5e9e2178d84d95bdde9cefb534c3d51533c7fd2 100644
(file)
--- a/
test/web/twitter_api/password_controller_test.exs
+++ b/
test/web/twitter_api/password_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
@@
-37,7
+37,7
@@
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
test "it returns HTTP 200", %{conn: conn} do
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
test "it returns HTTP 200", %{conn: conn} do
user = insert(:user)
{:ok, token} = PasswordResetToken.create_token(user)
- {:ok, _access_token} = Token.create
_token
(insert(:oauth_app), user, %{})
+ {:ok, _access_token} = Token.create(insert(:oauth_app), user, %{})
params = %{
"password" => "test",
params = %{
"password" => "test",
@@
-54,7
+54,7
@@
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
assert response =~ "<h2>Password changed!</h2>"
user = refresh_record(user)
assert response =~ "<h2>Password changed!</h2>"
user = refresh_record(user)
- assert
Comeonin.Pbkdf2.checkpw
("test", user.password_hash)
+ assert
Pbkdf2.verify_pass
("test", user.password_hash)
assert Enum.empty?(Token.get_user_tokens(user))
end
assert Enum.empty?(Token.get_user_tokens(user))
end
@@
-62,7
+62,7
@@
defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
user = insert(:user, password_reset_pending: true)
{:ok, token} = PasswordResetToken.create_token(user)
user = insert(:user, password_reset_pending: true)
{:ok, token} = PasswordResetToken.create_token(user)
- {:ok, _access_token} = Token.create
_token
(insert(:oauth_app), user, %{})
+ {:ok, _access_token} = Token.create(insert(:oauth_app), user, %{})
params = %{
"password" => "test",
params = %{
"password" => "test",