summaryrefslogtreecommitdiff
path: root/test/web/oauth/ldap_authorization_test.exs
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/oauth/ldap_authorization_test.exs
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/oauth/ldap_authorization_test.exs')
-rw-r--r--test/web/oauth/ldap_authorization_test.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/oauth/ldap_authorization_test.exs b/test/web/oauth/ldap_authorization_test.exs
index a8fe8a841..011642c08 100644
--- a/test/web/oauth/ldap_authorization_test.exs
+++ b/test/web/oauth/ldap_authorization_test.exs
@@ -19,7 +19,7 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
@tag @skip
test "authorizes the existing user using LDAP credentials" do
password = "testpassword"
- user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password))
+ user = insert(:user, password_hash: Pbkdf2.hash_pwd_salt(password))
app = insert(:oauth_app, scopes: ["read", "write"])
host = Pleroma.Config.get([:ldap, :host]) |> to_charlist
@@ -104,7 +104,7 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
@tag @skip
test "falls back to the default authorization when LDAP is unavailable" do
password = "testpassword"
- user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password))
+ user = insert(:user, password_hash: Pbkdf2.hash_pwd_salt(password))
app = insert(:oauth_app, scopes: ["read", "write"])
host = Pleroma.Config.get([:ldap, :host]) |> to_charlist
@@ -148,7 +148,7 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
@tag @skip
test "disallow authorization for wrong LDAP credentials" do
password = "testpassword"
- user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password))
+ user = insert(:user, password_hash: Pbkdf2.hash_pwd_salt(password))
app = insert(:oauth_app, scopes: ["read", "write"])
host = Pleroma.Config.get([:ldap, :host]) |> to_charlist