projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
[akkoma]
/
test
/
web
/
oauth
/
ldap_authorization_test.exs
diff --git
a/test/web/oauth/ldap_authorization_test.exs
b/test/web/oauth/ldap_authorization_test.exs
index 1cbe133b7bbb2586d29bda3920b6c5e6e6e8ebd8..011642c0874d13dc31e0455bffd1ab5022d73e4c 100644
(file)
--- a/
test/web/oauth/ldap_authorization_test.exs
+++ b/
test/web/oauth/ldap_authorization_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
@@
-12,18
+12,14
@@
defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
@skip if !Code.ensure_loaded?(:eldap), do: :skip
@skip if !Code.ensure_loaded?(:eldap), do: :skip
- clear_config_all([:ldap, :enabled]) do
- Pleroma.Config.put([:ldap, :enabled], true)
- end
+ setup_all do: clear_config([:ldap, :enabled], true)
- clear_config_all(Pleroma.Web.Auth.Authenticator) do
- Pleroma.Config.put(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.LDAPAuthenticator)
- end
+ setup_all do: clear_config(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.LDAPAuthenticator)
@tag @skip
test "authorizes the existing user using LDAP credentials" do
password = "testpassword"
@tag @skip
test "authorizes the existing user using LDAP credentials" do
password = "testpassword"
- user = insert(:user, password_hash:
Comeonin.Pbkdf2.hashpw
salt(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
app = insert(:oauth_app, scopes: ["read", "write"])
host = Pleroma.Config.get([:ldap, :host]) |> to_charlist
@@
-108,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"
@tag @skip
test "falls back to the default authorization when LDAP is unavailable" do
password = "testpassword"
- user = insert(:user, password_hash:
Comeonin.Pbkdf2.hashpw
salt(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
app = insert(:oauth_app, scopes: ["read", "write"])
host = Pleroma.Config.get([:ldap, :host]) |> to_charlist
@@
-152,7
+148,7
@@
defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
@tag @skip
test "disallow authorization for wrong LDAP credentials" do
password = "testpassword"
@tag @skip
test "disallow authorization for wrong LDAP credentials" do
password = "testpassword"
- user = insert(:user, password_hash:
Comeonin.Pbkdf2.hashpw
salt(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
app = insert(:oauth_app, scopes: ["read", "write"])
host = Pleroma.Config.get([:ldap, :host]) |> to_charlist