diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-13 12:42:36 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-13 12:42:36 +0300 |
| commit | fd2fb2bb2e2292997fbe6f70c4d12b50c56cfab9 (patch) | |
| tree | 12f2ac82ed24394fb52b5d0664583dc668814421 /test/web/mongooseim/mongoose_im_controller_test.exs | |
| parent | bfb48e3db6009c31e52cfe5ac4828a6143d7e549 (diff) | |
| parent | 156c8a508846bd6d4e55f666c4ecc6f0129ac5fc (diff) | |
| download | pleroma-fd2fb2bb2e2292997fbe6f70c4d12b50c56cfab9.tar.gz pleroma-fd2fb2bb2e2292997fbe6f70c4d12b50c56cfab9.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
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 = |