Allow toggling between grid and list view in shelf view (shelves.show)

[bookstack] / tests / Uploads / ImageTest.php

diff --git a/tests/Uploads/ImageTest.php b/tests/Uploads/ImageTest.php
index 01bf23d5b2b3ba2ab9a631d9ef151e101ff94ada..0615a95ce52641cff442ce913d59bb65f812d2b3 100644 (file)
--- a/tests/Uploads/ImageTest.php
+++ b/tests/Uploads/ImageTest.php
@@ -4,6 +4,7 @@ use BookStack\Entities\Repos\PageRepo;
 use BookStack\Uploads\Image;
 use BookStack\Entities\Page;
 use BookStack\Uploads\ImageService;
 use BookStack\Uploads\Image;
 use BookStack\Entities\Page;
 use BookStack\Uploads\ImageService;

+use Illuminate\Support\Str;

 use Tests\TestCase;
 
 class ImageTest extends TestCase
 use Tests\TestCase;
 
 class ImageTest extends TestCase


@@ -43,7 +44,7 @@ class ImageTest extends TestCase
         $imgDetails = $this->uploadGalleryImage();
         $image = Image::query()->first();
 
         $imgDetails = $this->uploadGalleryImage();
         $image = Image::query()->first();
 

-        $newName = str_random();
+        $newName = Str::random();

         $update = $this->put('/images/' . $image->id, ['name' => $newName]);
         $update->assertSuccessful();
         $update->assertJson([
         $update = $this->put('/images/' . $image->id, ['name' => $newName]);
         $update->assertSuccessful();
         $update->assertJson([


@@ -89,7 +90,7 @@ class ImageTest extends TestCase
         $searchHitRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}&search={$namePartial}");
         $searchHitRequest->assertSuccessful()->assertJson($resultJson);
 
         $searchHitRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}&search={$namePartial}");
         $searchHitRequest->assertSuccessful()->assertJson($resultJson);
 

-        $namePartial = str_random(16);
+        $namePartial = Str::random(16);

         $searchHitRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}&search={$namePartial}");
         $searchHitRequest->assertSuccessful()->assertExactJson($emptyJson);
     }
         $searchHitRequest = $this->get("/images/gallery?page=1&uploaded_to={$pageId}&search={$namePartial}");
         $searchHitRequest->assertSuccessful()->assertExactJson($emptyJson);
     }


@@ -176,7 +177,7 @@ class ImageTest extends TestCase
 
     public function test_secure_images_uploads_to_correct_place()
     {
 
     public function test_secure_images_uploads_to_correct_place()
     {

-        config()->set('filesystems.default', 'local_secure');
+        config()->set('filesystems.images', 'local_secure');

         $this->asEditor();
         $galleryFile = $this->getTestImage('my-secure-test-upload.png');
         $page = Page::first();
         $this->asEditor();
         $galleryFile = $this->getTestImage('my-secure-test-upload.png');
         $page = Page::first();


@@ -194,7 +195,7 @@ class ImageTest extends TestCase
 
     public function test_secure_images_included_in_exports()
     {
 
     public function test_secure_images_included_in_exports()
     {

-        config()->set('filesystems.default', 'local_secure');
+        config()->set('filesystems.images', 'local_secure');

         $this->asEditor();
         $galleryFile = $this->getTestImage('my-secure-test-upload.png');
         $page = Page::first();
         $this->asEditor();
         $galleryFile = $this->getTestImage('my-secure-test-upload.png');
         $page = Page::first();


@@ -208,7 +209,7 @@ class ImageTest extends TestCase
 
         $encodedImageContent = base64_encode(file_get_contents($expectedPath));
         $export = $this->get($page->getUrl('/export/html'));
 
         $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');
+        $this->assertTrue(strpos($export->getContent(), $encodedImageContent) !== false, 'Uploaded image in export content');

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


@@ -217,7 +218,7 @@ class ImageTest extends TestCase
 
     public function test_system_images_remain_public()
     {
 
     public function test_system_images_remain_public()
     {

-        config()->set('filesystems.default', 'local_secure');
+        config()->set('filesystems.images', 'local_secure');

         $this->asAdmin();
         $galleryFile = $this->getTestImage('my-system-test-upload.png');
         $expectedPath = public_path('uploads/images/system/' . Date('Y-m') . '/my-system-test-upload.png');
         $this->asAdmin();
         $galleryFile = $this->getTestImage('my-system-test-upload.png');
         $expectedPath = public_path('uploads/images/system/' . Date('Y-m') . '/my-system-test-upload.png');


@@ -366,7 +367,7 @@ class ImageTest extends TestCase
         $image = Image::where('type', '=', 'gallery')->first();
 
         $pageRepo = app(PageRepo::class);
         $image = Image::where('type', '=', 'gallery')->first();
 
         $pageRepo = app(PageRepo::class);

-        $pageRepo->updatePage($page, $page->book_id, [
+        $pageRepo->update($page, [

             'name' => $page->name,
             'html' => $page->html . "<img src=\"{$image->url}\">",
             'summary' => ''
             'name' => $page->name,
             'html' => $page->html . "<img src=\"{$image->url}\">",
             'summary' => ''


@@ -378,7 +379,7 @@ class ImageTest extends TestCase
         $this->assertCount(0, $toDelete);
 
         // Save a revision of our page without the image;
         $this->assertCount(0, $toDelete);
 
         // Save a revision of our page without the image;

-        $pageRepo->updatePage($page, $page->book_id, [
+        $pageRepo->update($page, [

             'name' => $page->name,
             'html' => "<p>Hello</p>",
             'summary' => ''
             'name' => $page->name,
             'html' => "<p>Hello</p>",
             'summary' => ''