Guest create page: name field autofocus

[bookstack] / tests / Auth / LdapTest.php

diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index c59685ef5daadd422ab7d22252092517a3b3ee1a..978420f869ede41d480cbe7258f1c6600773e3d5 100644 (file)
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -6,9 +6,9 @@ use BookStack\Auth\Access\Ldap;
 use BookStack\Auth\Access\LdapService;
 use BookStack\Auth\Role;
 use BookStack\Auth\User;
 use BookStack\Auth\Access\LdapService;
 use BookStack\Auth\Role;
 use BookStack\Auth\User;

+use Illuminate\Testing\TestResponse;

 use Mockery\MockInterface;
 use Tests\TestCase;
 use Mockery\MockInterface;
 use Tests\TestCase;

-use Tests\TestResponse;

 
 class LdapTest extends TestCase
 {
 
 class LdapTest extends TestCase
 {


@@ -106,7 +106,7 @@ class LdapTest extends TestCase
         $resp->assertSee($this->mockUser->name);
 
         $resp = $this->followingRedirects()->mockUserLogin($this->mockUser->email);
         $resp->assertSee($this->mockUser->name);
 
         $resp = $this->followingRedirects()->mockUserLogin($this->mockUser->email);

-        $resp->assertElementExists('#home-default');
+        $this->withHtml($resp)->assertElementExists('#home-default');

         $resp->assertSee($this->mockUser->name);
         $this->assertDatabaseHas('users', [
             'email'            => $this->mockUser->email,
         $resp->assertSee($this->mockUser->name);
         $this->assertDatabaseHas('users', [
             'email'            => $this->mockUser->email,


@@ -251,7 +251,8 @@ class LdapTest extends TestCase
 
     public function test_registration_disabled()
     {
 
     public function test_registration_disabled()
     {

-        $this->followingRedirects()->get('/register')->assertElementContains('#content', 'Log In');
+        $resp = $this->followingRedirects()->get('/register');
+        $this->withHtml($resp)->assertElementContains('#content', 'Log In');

     }
 
     public function test_non_admins_cannot_change_auth_id()
     }
 
     public function test_non_admins_cannot_change_auth_id()


@@ -367,7 +368,7 @@ class LdapTest extends TestCase
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn($userResp, ['count' => 1,
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
             ->with($this->resourceId, config('services.ldap.base_dn'), \Mockery::type('string'), \Mockery::type('array'))
             ->andReturn($userResp, ['count' => 1,

-                0 => [
+                0                           => [

                     'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
                     'memberof' => [
                         'count' => 1,
                     'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
                     'memberof' => [
                         'count' => 1,


@@ -376,13 +377,13 @@ class LdapTest extends TestCase
                 ],
             ], [
                 'count' => 1,
                 ],
             ], [
                 'count' => 1,

-                0 => [
-                    'dn' => 'cn=ldaptester,ou=groups,dc=example,dc=com',
+                0       => [
+                    'dn'       => 'cn=ldaptester,ou=groups,dc=example,dc=com',

                     'memberof' => [
                         'count' => 1,
                         0       => 'cn=monsters,ou=groups,dc=example,dc=com',
                     ],
                     'memberof' => [
                         'count' => 1,
                         0       => 'cn=monsters,ou=groups,dc=example,dc=com',
                     ],

-                ]
+                ],

             ], ['count' => 0]);
 
         $resp = $this->mockUserLogin();
             ], ['count' => 0]);
 
         $resp = $this->mockUserLogin();


@@ -390,9 +391,9 @@ class LdapTest extends TestCase
             'details_from_ldap' => [
                 'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
                 'memberof' => [
             'details_from_ldap' => [
                 'dn'       => 'dc=test,' . config('services.ldap.base_dn'),
                 'memberof' => [

-                    0 => 'cn=ldaptester,ou=groups,dc=example,dc=com',
+                    0       => 'cn=ldaptester,ou=groups,dc=example,dc=com',

                     'count' => 1,
                     'count' => 1,

-                ]
+                ],

             ],
             'parsed_direct_user_groups' => [
                 'ldaptester',
             ],
             'parsed_direct_user_groups' => [
                 'ldaptester',


@@ -615,7 +616,7 @@ class LdapTest extends TestCase
 
     public function test_dump_user_details_option_works()
     {
 
     public function test_dump_user_details_option_works()
     {

-        config()->set(['services.ldap.dump_user_details' => true]);
+        config()->set(['services.ldap.dump_user_details' => true, 'services.ldap.thumbnail_attribute' => 'jpegphoto']);

 
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)
 
         $this->commonLdapMocks(1, 1, 1, 1, 1);
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(1)


@@ -623,7 +624,9 @@ class LdapTest extends TestCase
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],
             ->andReturn(['count' => 1, 0 => [
                 'uid' => [$this->mockUser->name],
                 'cn'  => [$this->mockUser->name],

-                'dn'  => ['dc=test' . config('services.ldap.base_dn')],
+                // Test dumping binary data for avatar responses
+                'jpegphoto' => base64_decode('/9j/4AAQSkZJRg=='),
+                'dn'        => ['dc=test' . config('services.ldap.base_dn')],

             ]]);
 
         $resp = $this->post('/login', [
             ]]);
 
         $resp = $this->post('/login', [