diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-13 19:56:40 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-13 19:56:40 +0300 |
commit | 8a383707ae143ba47fa1ba68da20bc6bec425126 (patch) | |
tree | f05d4fd3ea7b52de7a37a2e625de18ba6af14b90 /test/web/auth | |
parent | f3f8ed9e19f1ab8863141ba8b31773c54f4771fb (diff) | |
parent | da550be066a15108ceef7874c3b2549c049a7f88 (diff) | |
download | pleroma-8a383707ae143ba47fa1ba68da20bc6bec425126.tar.gz pleroma-8a383707ae143ba47fa1ba68da20bc6bec425126.zip |
Merge develop
Diffstat (limited to 'test/web/auth')
-rw-r--r-- | test/web/auth/basic_auth_test.exs | 2 | ||||
-rw-r--r-- | test/web/auth/pleroma_authenticator_test.exs | 2 | ||||
-rw-r--r-- | test/web/auth/totp_authenticator_test.exs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/web/auth/basic_auth_test.exs b/test/web/auth/basic_auth_test.exs index 64f8a6863..bf6e3d2fc 100644 --- a/test/web/auth/basic_auth_test.exs +++ b/test/web/auth/basic_auth_test.exs @@ -11,7 +11,7 @@ defmodule Pleroma.Web.Auth.BasicAuthTest do conn: conn } do user = insert(:user) - assert Comeonin.Pbkdf2.checkpw("test", user.password_hash) + assert Pbkdf2.verify_pass("test", user.password_hash) basic_auth_contents = (URI.encode_www_form(user.nickname) <> ":" <> URI.encode_www_form("test")) diff --git a/test/web/auth/pleroma_authenticator_test.exs b/test/web/auth/pleroma_authenticator_test.exs index 7125c5081..5a421e5ed 100644 --- a/test/web/auth/pleroma_authenticator_test.exs +++ b/test/web/auth/pleroma_authenticator_test.exs @@ -11,7 +11,7 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticatorTest do setup do password = "testpassword" name = "AgentSmith" - user = insert(:user, nickname: name, password_hash: Comeonin.Pbkdf2.hashpwsalt(password)) + user = insert(:user, nickname: name, password_hash: Pbkdf2.hash_pwd_salt(password)) {:ok, [user: user, name: name, password: password]} end diff --git a/test/web/auth/totp_authenticator_test.exs b/test/web/auth/totp_authenticator_test.exs index e08069490..e502e0ae8 100644 --- a/test/web/auth/totp_authenticator_test.exs +++ b/test/web/auth/totp_authenticator_test.exs @@ -34,7 +34,7 @@ defmodule Pleroma.Web.Auth.TOTPAuthenticatorTest do hashed_codes = backup_codes - |> Enum.map(&Comeonin.Pbkdf2.hashpwsalt(&1)) + |> Enum.map(&Pbkdf2.hash_pwd_salt(&1)) user = insert(:user, |