From 6d20bdc1fbb4da20e7f5c40c0beafcafc296a18d Mon Sep 17 00:00:00 2001 From: Daniel Fanara Date: Sat, 9 Mar 2019 01:13:30 -0500 Subject: [PATCH] Preserve original display_name_attribute configuration values. --- tests/Auth/LdapTest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php index d23c9ec84..54cf84266 100644 --- a/tests/Auth/LdapTest.php +++ b/tests/Auth/LdapTest.php @@ -375,6 +375,7 @@ class LdapTest extends BrowserKitTest public function test_login_uses_specified_display_name_attribute() { + $originalAttribute = config('services.ldap.display_name_attribute'); app('config')->set([ 'services.ldap.display_name_attribute' => 'displayName' ]); @@ -407,12 +408,13 @@ class LdapTest extends BrowserKitTest ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $this->mockUser->name, 'name' => 'displayNameAttribute']); app('config')->set([ - 'services.ldap.display_name_attribute' => 'cn' + 'services.ldap.display_name_attribute' => $originalAttribute ]); } public function test_login_uses_default_display_name_attribute_if_specified_not_present() { + $originalAttribute = config('services.ldap.display_name_attribute'); app('config')->set([ 'services.ldap.display_name_attribute' => 'displayName' ]); @@ -444,7 +446,7 @@ class LdapTest extends BrowserKitTest ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $this->mockUser->name, 'name' => $this->mockUser->name]); app('config')->set([ - 'services.ldap.display_name_attribute' => 'cn' + 'services.ldap.display_name_attribute' => $originalAttribute ]); }