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/mongooseim/mongoose_im_controller_test.exs | |
parent | f3f8ed9e19f1ab8863141ba8b31773c54f4771fb (diff) | |
parent | da550be066a15108ceef7874c3b2549c049a7f88 (diff) | |
download | pleroma-8a383707ae143ba47fa1ba68da20bc6bec425126.tar.gz pleroma-8a383707ae143ba47fa1ba68da20bc6bec425126.zip |
Merge develop
Diffstat (limited to 'test/web/mongooseim/mongoose_im_controller_test.exs')
-rw-r--r-- | test/web/mongooseim/mongoose_im_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/mongooseim/mongoose_im_controller_test.exs b/test/web/mongooseim/mongoose_im_controller_test.exs index 1ac2f2c27..5176cde84 100644 --- a/test/web/mongooseim/mongoose_im_controller_test.exs +++ b/test/web/mongooseim/mongoose_im_controller_test.exs @@ -41,13 +41,13 @@ defmodule Pleroma.Web.MongooseIMController do end test "/check_password", %{conn: conn} do - user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt("cool")) + user = insert(:user, password_hash: Pbkdf2.hash_pwd_salt("cool")) _deactivated_user = insert(:user, nickname: "konata", deactivated: true, - password_hash: Comeonin.Pbkdf2.hashpwsalt("cool") + password_hash: Pbkdf2.hash_pwd_salt("cool") ) res = |