aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-16 04:13:53 +0000
committerkaniini <nenolod@gmail.com>2019-03-16 04:13:53 +0000
commitf58d47d6f752fa04bfd0a5d809b6d4e28248654d (patch)
treea9a9ebb476160e0dc47932608afa289a40fa04ac
parent532e8b0a43f496cb2cab75850c385a9f17aee84e (diff)
parent40134598a88ec9123696bf42e49332520c9c7b6e (diff)
downloadpleroma-f58d47d6f752fa04bfd0a5d809b6d4e28248654d.tar.gz
Merge branch 'bugfix/ldap-test-fix' into 'develop'
test: fix defective ldap setup/teardown See merge request pleroma/pleroma!943
-rw-r--r--test/web/oauth/ldap_authorization_test.exs8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/web/oauth/ldap_authorization_test.exs b/test/web/oauth/ldap_authorization_test.exs
index 570e41f3e..5bf7eb93c 100644
--- a/test/web/oauth/ldap_authorization_test.exs
+++ b/test/web/oauth/ldap_authorization_test.exs
@@ -11,15 +11,17 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
import Mock
setup_all do
- ldap_authenticator = Pleroma.Config.get([Pleroma.Web.Auth.Authenticator])
+ ldap_authenticator =
+ Pleroma.Config.get(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator)
+
ldap_enabled = Pleroma.Config.get([:ldap, :enabled])
on_exit(fn ->
- Pleroma.Config.put([Pleroma.Web.Auth.Authenticator], ldap_authenticator)
+ Pleroma.Config.put(Pleroma.Web.Auth.Authenticator, ldap_authenticator)
Pleroma.Config.put([:ldap, :enabled], ldap_enabled)
end)
- Pleroma.Config.put([Pleroma.Web.Auth.Authenticator], Pleroma.Web.Auth.LDAPAuthenticator)
+ Pleroma.Config.put(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.LDAPAuthenticator)
Pleroma.Config.put([:ldap, :enabled], true)
:ok