Perms: Fixed some issues made when adding transactions

[bookstack] / tests / Uploads / AvatarTest.php

diff --git a/tests/Uploads/AvatarTest.php b/tests/Uploads/AvatarTest.php
index cf568d07cf6c909b7c46597b5a22d91bb25f94e2..f5b49a9fc21c245288b19cbd7966637b7dbb6bec 100644 (file)
--- a/tests/Uploads/AvatarTest.php
+++ b/tests/Uploads/AvatarTest.php
@@ -2,48 +2,38 @@
 
 namespace Tests\Uploads;
 
 
 namespace Tests\Uploads;
 

-use BookStack\Auth\User;

 use BookStack\Exceptions\HttpFetchException;
 use BookStack\Exceptions\HttpFetchException;

-use BookStack\Uploads\HttpFetcher;
+use BookStack\Uploads\UserAvatars;
+use BookStack\Users\Models\User;
+use GuzzleHttp\Exception\ConnectException;
+use GuzzleHttp\Psr7\Request;
+use GuzzleHttp\Psr7\Response;

 use Tests\TestCase;
 
 class AvatarTest extends TestCase
 {
 use Tests\TestCase;
 
 class AvatarTest extends TestCase
 {

-    use UsesImages;
-
-    protected function createUserRequest($user)
+    protected function createUserRequest($user): User

     {
         $this->asAdmin()->post('/settings/users/create', [
             'name'             => $user->name,
             'email'            => $user->email,
     {
         $this->asAdmin()->post('/settings/users/create', [
             'name'             => $user->name,
             'email'            => $user->email,

-            'password'         => 'testing',
-            'password-confirm' => 'testing',
+            'password'         => 'testing101',
+            'password-confirm' => 'testing101',

         ]);
 
         ]);
 

-        return User::where('email', '=', $user->email)->first();
-    }
-
-    protected function assertImageFetchFrom(string $url)
-    {
-        $http = $this->mock(HttpFetcher::class);
-
-        $http->shouldReceive('fetch')
-            ->once()->with($url)
-            ->andReturn($this->getTestImageContent());
+        return User::query()->where('email', '=', $user->email)->first();

     }
 
     }
 

-    protected function deleteUserImage(User $user)
+    protected function deleteUserImage(User $user): void

     {
     {

-        $this->deleteImage($user->avatar->path);
+        $this->files->deleteAtRelativePath($user->avatar->path);

     }
 
     public function test_gravatar_fetched_on_user_create()
     {
     }
 
     public function test_gravatar_fetched_on_user_create()
     {

-        config()->set([
-            'services.disable_services' => false,
-        ]);
-        $user = factory(User::class)->make();
-        $this->assertImageFetchFrom('https://www.gravatar.com/avatar/' . md5(strtolower($user->email)) . '?s=500&d=identicon');
+        $requests = $this->mockHttpClient([new Response(200, ['Content-Type' => 'image/png'], $this->files->pngImageData())]);
+        config()->set(['services.disable_services' => false]);
+        $user = User::factory()->make();

 
         $user = $this->createUserRequest($user);
         $this->assertDatabaseHas('images', [
 
         $user = $this->createUserRequest($user);
         $this->assertDatabaseHas('images', [


@@ -51,6 +41,9 @@ class AvatarTest extends TestCase
             'created_by' => $user->id,
         ]);
         $this->deleteUserImage($user);
             'created_by' => $user->id,
         ]);
         $this->deleteUserImage($user);

+
+        $expectedUri = 'https://www.gravatar.com/avatar/' . md5(strtolower($user->email)) . '?s=500&d=identicon';
+        $this->assertEquals($expectedUri, $requests->latestRequest()->getUri());

     }
 
     public function test_custom_url_used_if_set()
     }
 
     public function test_custom_url_used_if_set()


@@ -60,41 +53,74 @@ class AvatarTest extends TestCase
             'services.avatar_url'       => 'https://example.com/${email}/${hash}/${size}',
         ]);
 
             'services.avatar_url'       => 'https://example.com/${email}/${hash}/${size}',
         ]);
 

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

         $url = 'https://example.com/' . urlencode(strtolower($user->email)) . '/' . md5(strtolower($user->email)) . '/500';
         $url = 'https://example.com/' . urlencode(strtolower($user->email)) . '/' . md5(strtolower($user->email)) . '/500';

-        $this->assertImageFetchFrom($url);
+        $requests = $this->mockHttpClient([new Response(200, ['Content-Type' => 'image/png'], $this->files->pngImageData())]);

 
         $user = $this->createUserRequest($user);
 
         $user = $this->createUserRequest($user);

+        $this->assertEquals($url, $requests->latestRequest()->getUri());

         $this->deleteUserImage($user);
     }
 
     public function test_avatar_not_fetched_if_no_custom_url_and_services_disabled()
         $this->deleteUserImage($user);
     }
 
     public function test_avatar_not_fetched_if_no_custom_url_and_services_disabled()

+    {
+        config()->set(['services.disable_services' => true]);
+        $user = User::factory()->make();
+        $requests = $this->mockHttpClient([new Response()]);
+
+        $this->createUserRequest($user);
+
+        $this->assertEquals(0, $requests->requestCount());
+    }
+
+    public function test_avatar_not_fetched_if_avatar_url_option_set_to_false()

     {
         config()->set([
     {
         config()->set([

-            'services.disable_services' => true,
+            'services.disable_services' => false,
+            'services.avatar_url'       => false,

         ]);
 
         ]);
 

-        $user = factory(User::class)->make();
-
-        $http = $this->mock(HttpFetcher::class);
-        $http->shouldNotReceive('fetch');
+        $user = User::factory()->make();
+        $requests = $this->mockHttpClient([new Response()]);

 
         $this->createUserRequest($user);
 
         $this->createUserRequest($user);

+
+        $this->assertEquals(0, $requests->requestCount());

     }
 
     public function test_no_failure_but_error_logged_on_failed_avatar_fetch()
     {
     }
 
     public function test_no_failure_but_error_logged_on_failed_avatar_fetch()
     {

+        config()->set(['services.disable_services' => false]);
+
+        $this->mockHttpClient([new ConnectException('Failed to connect', new Request('GET', ''))]);
+
+        $logger = $this->withTestLogger();
+
+        $user = User::factory()->make();
+        $this->createUserRequest($user);
+        $this->assertTrue($logger->hasError('Failed to save user avatar image'));
+    }
+
+    public function test_exception_message_on_failed_fetch()
+    {
+        // set wrong url

         config()->set([
             'services.disable_services' => false,
         config()->set([
             'services.disable_services' => false,

+            'services.avatar_url'       => 'http_malformed_url/${email}/${hash}/${size}',

         ]);
 
         ]);
 

-        $http = $this->mock(HttpFetcher::class);
-        $http->shouldReceive('fetch')->andThrow(new HttpFetchException());
-
+        $user = User::factory()->make();
+        $avatar = app()->make(UserAvatars::class);

         $logger = $this->withTestLogger();
         $logger = $this->withTestLogger();

+        $this->mockHttpClient([new ConnectException('Could not resolve host http_malformed_url', new Request('GET', ''))]);

 
 

-        $user = factory(User::class)->make();
-        $this->createUserRequest($user);
+        $avatar->fetchAndAssignToUser($user);
+
+        $url = 'http_malformed_url/' . urlencode(strtolower($user->email)) . '/' . md5(strtolower($user->email)) . '/500';

         $this->assertTrue($logger->hasError('Failed to save user avatar image'));
         $this->assertTrue($logger->hasError('Failed to save user avatar image'));

+        $exception = $logger->getRecords()[0]['context']['exception'];
+        $this->assertInstanceOf(HttpFetchException::class, $exception);
+        $this->assertEquals('Cannot get image from ' . $url, $exception->getMessage());
+        $this->assertEquals('Could not resolve host http_malformed_url', $exception->getPrevious()->getMessage());

     }
 }
     }
 }