summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/password_controller_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-05-14 20:19:56 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-05-14 20:19:56 +0300
commite4b12494d77e7a6920a408d62d5b8fe0f886a14d (patch)
tree5b58e0cfaf33dc2fccd809e887e1194baa6b1191 /test/web/twitter_api/password_controller_test.exs
parentf1f588fd5271c0b3bf09df002a83dbb57c42bae0 (diff)
parente455ca3f3eee74db0b1e60550acf53bea915be3b (diff)
downloadpleroma-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/twitter_api/password_controller_test.exs')
-rw-r--r--test/web/twitter_api/password_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/twitter_api/password_controller_test.exs b/test/web/twitter_api/password_controller_test.exs
index 0a24860d3..231a46c67 100644
--- a/test/web/twitter_api/password_controller_test.exs
+++ b/test/web/twitter_api/password_controller_test.exs
@@ -54,7 +54,7 @@ defmodule Pleroma.Web.TwitterAPI.PasswordControllerTest do
assert response =~ "<h2>Password changed!</h2>"
user = refresh_record(user)
- assert Comeonin.Pbkdf2.checkpw("test", user.password_hash)
+ assert Pbkdf2.verify_pass("test", user.password_hash)
assert Enum.empty?(Token.get_user_tokens(user))
end