diff options
| author | lain <lain@soykaf.club> | 2020-05-13 07:45:35 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-13 07:45:35 +0000 |
| commit | 3210e939bf3b3f3c80a6774ae4d4a531ef5491cd (patch) | |
| tree | ef51aae2e3cbc43a506af4ad940a5be63fdb5e70 /test/web/mongooseim | |
| parent | c74018e6a7a19a40a75c343ddadc199d9990597e (diff) | |
| parent | b46811a07444187e7765f439e933f214c0a0aeb3 (diff) | |
| download | pleroma-3210e939bf3b3f3c80a6774ae4d4a531ef5491cd.tar.gz pleroma-3210e939bf3b3f3c80a6774ae4d4a531ef5491cd.zip | |
Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5
See merge request pleroma/pleroma!2523
Diffstat (limited to 'test/web/mongooseim')
| -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 = |