squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bugfix/ldap-test-fix' into 'develop'

Browse Source 
test: fix defective ldap setup/teardown

See merge request pleroma/pleroma!943
This commit is contained in:
kaniini 2019-03-16 04:13:53 +00:00
commit f58d47d6f7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/web/oauth/ldap_authorization_test.exs
View File

@ -11,15 +11,17 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
import Mock import Mock
setup_all do 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]) ldap_enabled = Pleroma.Config.get([:ldap, :enabled])
on_exit(fn -> 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) Pleroma.Config.put([:ldap, :enabled], ldap_enabled)
end) 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) Pleroma.Config.put([:ldap, :enabled], true)
:ok :ok