French translation update

[bookstack] / tests / ImageTest.php

diff --git a/tests/ImageTest.php b/tests/ImageTest.php
index 3bb41138bae7d50dd8d9821fed27bf0ad54ebad0..0f1e772e937e86660110f1ca171642872b33d693 100644 (file)
--- a/tests/ImageTest.php
+++ b/tests/ImageTest.php
@@ -1,7 +1,20 @@
 <?php namespace Tests;
 
 <?php namespace Tests;
 

-class ImageTest extends BrowserKitTest
+use BookStack\Image;
+use BookStack\Page;
+use BookStack\Repos\EntityRepo;
+use BookStack\Services\ImageService;
+
+class ImageTest extends TestCase

 {
 {

+    /**
+     * Get the path to our basic test image.
+     * @return string
+     */
+    protected function getTestImageFilePath()
+    {
+        return base_path('tests/test-data/test-image.png');
+    }

 
     /**
      * Get a test image that can be uploaded
 
     /**
      * Get a test image that can be uploaded


@@ -10,7 +23,7 @@ class ImageTest extends BrowserKitTest
      */
     protected function getTestImage($fileName)
     {
      */
     protected function getTestImage($fileName)
     {

-        return new \Illuminate\Http\UploadedFile(base_path('tests/test-data/test-image.jpg'), $fileName, 'image/jpeg', 5238);
+        return new \Illuminate\Http\UploadedFile($this->getTestImageFilePath(), $fileName, 'image/png', 5238);

     }
 
     /**
     }
 
     /**


@@ -28,13 +41,12 @@ class ImageTest extends BrowserKitTest
      * Uploads an image with the given name.
      * @param $name
      * @param int $uploadedTo
      * Uploads an image with the given name.
      * @param $name
      * @param int $uploadedTo

-     * @return string
+     * @return \Illuminate\Foundation\Testing\TestResponse

      */
     protected function uploadImage($name, $uploadedTo = 0)
     {
         $file = $this->getTestImage($name);
      */
     protected function uploadImage($name, $uploadedTo = 0)
     {
         $file = $this->getTestImage($name);

-        $this->call('POST', '/images/gallery/upload', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);
-        return $this->getTestImagePath('gallery', $name);
+        return $this->call('POST', '/images/gallery/upload', ['uploaded_to' => $uploadedTo], [], ['file' => $file], []);

     }
 
     /**
     }
 
     /**


@@ -43,25 +55,31 @@ class ImageTest extends BrowserKitTest
      */
     protected function deleteImage($relPath)
     {
      */
     protected function deleteImage($relPath)
     {

-        unlink(public_path($relPath));
+        $path = public_path($relPath);
+        if (file_exists($path)) {
+            unlink($path);
+        }

     }
 
 
     public function test_image_upload()
     {
     }
 
 
     public function test_image_upload()
     {

-        $page = \BookStack\Page::first();
-        $this->asAdmin();
+        $page = Page::first();

         $admin = $this->getAdmin();
         $admin = $this->getAdmin();

-        $imageName = 'first-image.jpg';
+        $this->actingAs($admin);
+
+        $imageName = 'first-image.png';
+        $relPath = $this->getTestImagePath('gallery', $imageName);
+        $this->deleteImage($relPath);

 
 

-        $relPath = $this->uploadImage($imageName, $page->id);
-        $this->assertResponseOk();
+        $upload = $this->uploadImage($imageName, $page->id);
+        $upload->assertStatus(200);

 
         $this->assertTrue(file_exists(public_path($relPath)), 'Uploaded image not found at path: '. public_path($relPath));
 
         $this->deleteImage($relPath);
 
 
         $this->assertTrue(file_exists(public_path($relPath)), 'Uploaded image not found at path: '. public_path($relPath));
 
         $this->deleteImage($relPath);
 

-        $this->seeInDatabase('images', [
+        $this->assertDatabaseHas('images', [

             'url' => $this->baseUrl . $relPath,
             'type' => 'gallery',
             'uploaded_to' => $page->id,
             'url' => $this->baseUrl . $relPath,
             'type' => 'gallery',
             'uploaded_to' => $page->id,


@@ -70,22 +88,81 @@ class ImageTest extends BrowserKitTest
             'updated_by' => $admin->id,
             'name' => $imageName
         ]);
             'updated_by' => $admin->id,
             'name' => $imageName
         ]);

+    }
+
+    public function test_secure_images_uploads_to_correct_place()
+    {
+        config()->set('filesystems.default', 'local_secure');
+        $this->asEditor();
+        $galleryFile = $this->getTestImage('my-secure-test-upload');
+        $page = Page::first();
+        $expectedPath = storage_path('uploads/images/gallery/' . Date('Y-m-M') . '/my-secure-test-upload');
+
+        $upload = $this->call('POST', '/images/gallery/upload', ['uploaded_to' => $page->id], [], ['file' => $galleryFile], []);
+        $upload->assertStatus(200);
+
+        $this->assertTrue(file_exists($expectedPath), 'Uploaded image not found at path: '. $expectedPath);
+
+        if (file_exists($expectedPath)) {
+            unlink($expectedPath);
+        }
+    }
+
+    public function test_secure_images_included_in_exports()
+    {
+        config()->set('filesystems.default', 'local_secure');
+        $this->asEditor();
+        $galleryFile = $this->getTestImage('my-secure-test-upload');
+        $page = Page::first();
+        $expectedPath = storage_path('uploads/images/gallery/' . Date('Y-m-M') . '/my-secure-test-upload');
+
+        $upload = $this->call('POST', '/images/gallery/upload', ['uploaded_to' => $page->id], [], ['file' => $galleryFile], []);
+        $imageUrl = json_decode($upload->getContent(), true)['url'];
+        $page->html .= "<img src=\"{$imageUrl}\">";
+        $page->save();
+        $upload->assertStatus(200);
+
+        $encodedImageContent = base64_encode(file_get_contents($expectedPath));
+        $export = $this->get($page->getUrl('/export/html'));
+        $this->assertTrue(str_contains($export->getContent(), $encodedImageContent), 'Uploaded image in export content');
+
+        if (file_exists($expectedPath)) {
+            unlink($expectedPath);
+        }
+    }
+
+    public function test_system_images_remain_public()
+    {
+        config()->set('filesystems.default', 'local_secure');
+        $this->asEditor();
+        $galleryFile = $this->getTestImage('my-system-test-upload');
+        $page = Page::first();
+        $expectedPath = public_path('uploads/images/system/' . Date('Y-m-M') . '/my-system-test-upload');
+
+        $upload = $this->call('POST', '/images/system/upload', ['uploaded_to' => $page->id], [], ['file' => $galleryFile], []);
+        $upload->assertStatus(200);
+
+        $this->assertTrue(file_exists($expectedPath), 'Uploaded image not found at path: '. $expectedPath);

 
 

+        if (file_exists($expectedPath)) {
+            unlink($expectedPath);
+        }

     }
 
     public function test_image_delete()
     {
     }
 
     public function test_image_delete()
     {

-        $page = \BookStack\Page::first();
+        $page = Page::first();

         $this->asAdmin();
         $this->asAdmin();

-        $imageName = 'first-image.jpg';
+        $imageName = 'first-image.png';

 
 

-        $relPath = $this->uploadImage($imageName, $page->id);
-        $image = \BookStack\Image::first();
+        $this->uploadImage($imageName, $page->id);
+        $image = Image::first();
+        $relPath = $this->getTestImagePath('gallery', $imageName);

 
 

-        $this->call('DELETE', '/images/' . $image->id);
-        $this->assertResponseOk();
+        $delete = $this->delete( '/images/' . $image->id);
+        $delete->assertStatus(200);

 
 

-        $this->dontSeeInDatabase('images', [
+        $this->assertDatabaseMissing('images', [

             'url' => $this->baseUrl . $relPath,
             'type' => 'gallery'
         ]);
             'url' => $this->baseUrl . $relPath,
             'type' => 'gallery'
         ]);


@@ -93,4 +170,125 @@ class ImageTest extends BrowserKitTest
         $this->assertFalse(file_exists(public_path($relPath)), 'Uploaded image has not been deleted as expected');
     }
 
         $this->assertFalse(file_exists(public_path($relPath)), 'Uploaded image has not been deleted as expected');
     }
 

+    public function testBase64Get()
+    {
+        $page = Page::first();
+        $this->asAdmin();
+        $imageName = 'first-image.png';
+
+        $this->uploadImage($imageName, $page->id);
+        $image = Image::first();
+
+        $imageGet = $this->getJson("/images/base64/{$image->id}");
+        $imageGet->assertJson([
+            'content' => 'iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4gEcDCo5iYNs+gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFElEQVQI12O0jN/KgASYGFABqXwAZtoBV6Sl3hIAAAAASUVORK5CYII='
+        ]);
+    }
+
+    public function test_drawing_base64_upload()
+    {
+        $page = Page::first();
+        $editor = $this->getEditor();
+        $this->actingAs($editor);
+
+        $upload = $this->postJson('images/drawing/upload', [
+            'uploaded_to' => $page->id,
+            'image' => 'image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4gEcDCo5iYNs+gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAFElEQVQI12O0jN/KgASYGFABqXwAZtoBV6Sl3hIAAAAASUVORK5CYII='
+        ]);
+
+        $upload->assertStatus(200);
+        $upload->assertJson([
+            'type' => 'drawio',
+            'uploaded_to' => $page->id,
+            'created_by' => $editor->id,
+            'updated_by' => $editor->id,
+        ]);
+
+        $image = Image::where('type', '=', 'drawio')->first();
+        $this->assertTrue(file_exists(public_path($image->path)), 'Uploaded image not found at path: '. public_path($image->path));
+
+        $testImageData = file_get_contents($this->getTestImageFilePath());
+        $uploadedImageData = file_get_contents(public_path($image->path));
+        $this->assertTrue($testImageData === $uploadedImageData, "Uploaded image file data does not match our test image as expected");
+    }
+
+    public function test_user_images_deleted_on_user_deletion()
+    {
+        $editor = $this->getEditor();
+        $this->actingAs($editor);
+
+        $imageName = 'profile.png';
+        $relPath = $this->getTestImagePath('gallery', $imageName);
+        $this->deleteImage($relPath);
+
+        $file = $this->getTestImage($imageName);
+        $this->call('POST', '/images/user/upload', [], [], ['file' => $file], []);
+        $this->call('POST', '/images/user/upload', [], [], ['file' => $file], []);
+
+        $profileImages = Image::where('type', '=', 'user')->where('created_by', '=', $editor->id)->get();
+        $this->assertTrue($profileImages->count() === 2, "Found profile images does not match upload count");
+
+        $userDelete = $this->asAdmin()->delete("/settings/users/{$editor->id}");
+        $userDelete->assertStatus(302);
+        $this->assertDatabaseMissing('images', [
+            'type' => 'user',
+            'created_by' => $editor->id
+        ]);
+    }
+
+    public function test_deleted_unused_images()
+    {
+        $page = Page::first();
+        $admin = $this->getAdmin();
+        $this->actingAs($admin);
+
+        $imageName = 'unused-image.png';
+        $relPath = $this->getTestImagePath('gallery', $imageName);
+        $this->deleteImage($relPath);
+
+        $upload = $this->uploadImage($imageName, $page->id);
+        $upload->assertStatus(200);
+        $image = Image::where('type', '=', 'gallery')->first();
+
+        $entityRepo = app(EntityRepo::class);
+        $entityRepo->updatePage($page, $page->book_id, [
+            'name' => $page->name,
+            'html' => $page->html . "<img src=\"{$image->url}\">",
+            'summary' => ''
+        ]);
+
+        // Ensure no images are reported as deletable
+        $imageService = app(ImageService::class);
+        $toDelete = $imageService->deleteUnusedImages(true, true);
+        $this->assertCount(0, $toDelete);
+
+        // Save a revision of our page without the image;
+        $entityRepo->updatePage($page, $page->book_id, [
+            'name' => $page->name,
+            'html' => "<p>Hello</p>",
+            'summary' => ''
+        ]);
+
+        // Ensure revision images are picked up okay
+        $imageService = app(ImageService::class);
+        $toDelete = $imageService->deleteUnusedImages(true, true);
+        $this->assertCount(0, $toDelete);
+        $toDelete = $imageService->deleteUnusedImages(false, true);
+        $this->assertCount(1, $toDelete);
+
+        // Check image is found when revisions are destroyed
+        $page->revisions()->delete();
+        $toDelete = $imageService->deleteUnusedImages(true, true);
+        $this->assertCount(1, $toDelete);
+
+        // Check the image is deleted
+        $absPath = public_path($relPath);
+        $this->assertTrue(file_exists($absPath), "Existing uploaded file at path {$absPath} exists");
+        $toDelete = $imageService->deleteUnusedImages(true, false);
+        $this->assertCount(1, $toDelete);
+        $this->assertFalse(file_exists($absPath));
+
+        $this->deleteImage($relPath);
+    }
+

 }
\ No newline at end of file
 }
\ No newline at end of file