diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-14 20:19:56 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-05-14 20:19:56 +0300 |
| commit | e4b12494d77e7a6920a408d62d5b8fe0f886a14d (patch) | |
| tree | 5b58e0cfaf33dc2fccd809e887e1194baa6b1191 /test/web/oauth/mfa_controller_test.exs | |
| parent | f1f588fd5271c0b3bf09df002a83dbb57c42bae0 (diff) | |
| parent | e455ca3f3eee74db0b1e60550acf53bea915be3b (diff) | |
| download | pleroma-e4b12494d77e7a6920a408d62d5b8fe0f886a14d.tar.gz pleroma-e4b12494d77e7a6920a408d62d5b8fe0f886a14d.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
Diffstat (limited to 'test/web/oauth/mfa_controller_test.exs')
| -rw-r--r-- | test/web/oauth/mfa_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/oauth/mfa_controller_test.exs b/test/web/oauth/mfa_controller_test.exs index ce4a07320..3c341facd 100644 --- a/test/web/oauth/mfa_controller_test.exs +++ b/test/web/oauth/mfa_controller_test.exs @@ -20,7 +20,7 @@ defmodule Pleroma.Web.OAuth.MFAControllerTest do insert(:user, multi_factor_authentication_settings: %MFA.Settings{ enabled: true, - backup_codes: [Comeonin.Pbkdf2.hashpwsalt("test-code")], + backup_codes: [Pbkdf2.hash_pwd_salt("test-code")], totp: %MFA.Settings.TOTP{secret: otp_secret, confirmed: true} } ) @@ -247,7 +247,7 @@ defmodule Pleroma.Web.OAuth.MFAControllerTest do hashed_codes = backup_codes - |> Enum.map(&Comeonin.Pbkdf2.hashpwsalt(&1)) + |> Enum.map(&Pbkdf2.hash_pwd_salt(&1)) user = insert(:user, |