summaryrefslogtreecommitdiff
path: root/test/web/twitter_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-05-13 07:45:35 +0000
committerlain <lain@soykaf.club>2020-05-13 07:45:35 +0000
commit3210e939bf3b3f3c80a6774ae4d4a531ef5491cd (patch)
treeef51aae2e3cbc43a506af4ad940a5be63fdb5e70 /test/web/twitter_api
parentc74018e6a7a19a40a75c343ddadc199d9990597e (diff)
parentb46811a07444187e7765f439e933f214c0a0aeb3 (diff)
downloadpleroma-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/twitter_api')
-rw-r--r--test/web/twitter_api/password_controller_test.exs2
-rw-r--r--test/web/twitter_api/util_controller_test.exs2
2 files changed, 2 insertions, 2 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
diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs
index b701239a0..ad919d341 100644
--- a/test/web/twitter_api/util_controller_test.exs
+++ b/test/web/twitter_api/util_controller_test.exs
@@ -688,7 +688,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
assert json_response(conn, 200) == %{"status" => "success"}
fetched_user = User.get_cached_by_id(user.id)
- assert Comeonin.Pbkdf2.checkpw("newpass", fetched_user.password_hash) == true
+ assert Pbkdf2.verify_pass("newpass", fetched_user.password_hash) == true
end
end