logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: f58d47d6f752fa04bfd0a5d809b6d4e28248654d
parent: 532e8b0a43f496cb2cab75850c385a9f17aee84e
Author: kaniini <nenolod@gmail.com>
Date:   Sat, 16 Mar 2019 04:13:53 +0000

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

test: fix defective ldap setup/teardown

See merge request pleroma/pleroma!943

Diffstat:

Mtest/web/oauth/ldap_authorization_test.exs8+++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 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