Added language list favourites sorting, updated styles

[bookstack] / tests / Api / ShelvesApiTest.php

diff --git a/tests/Api/ShelvesApiTest.php b/tests/Api/ShelvesApiTest.php
index 32715dd0a1630165af36f5f86254931bd8874ff8..bc7b6f16493a91f9091b04cf0b002599477b9865 100644 (file)
--- a/tests/Api/ShelvesApiTest.php
+++ b/tests/Api/ShelvesApiTest.php
@@ -1,14 +1,20 @@
-<?php namespace Tests\Api;
+<?php
+
+namespace Tests\Api;

 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;
 
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Bookshelf;

+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;

 use Tests\TestCase;
 use Tests\TestCase;

+use Tests\Uploads\UsesImages;

 
 class ShelvesApiTest extends TestCase
 {
     use TestsApi;
 
 class ShelvesApiTest extends TestCase
 {
     use TestsApi;

+    use UsesImages;

 
 

-    protected $baseEndpoint = '/api/shelves';
+    protected string $baseEndpoint = '/api/shelves';

 
     public function test_index_endpoint_returns_expected_shelf()
     {
 
     public function test_index_endpoint_returns_expected_shelf()
     {


@@ -18,10 +24,10 @@ class ShelvesApiTest extends TestCase
         $resp = $this->getJson($this->baseEndpoint . '?count=1&sort=+id');
         $resp->assertJson(['data' => [
             [
         $resp = $this->getJson($this->baseEndpoint . '?count=1&sort=+id');
         $resp->assertJson(['data' => [
             [

-                'id' => $firstBookshelf->id,
+                'id'   => $firstBookshelf->id,

                 'name' => $firstBookshelf->name,
                 'slug' => $firstBookshelf->slug,
                 'name' => $firstBookshelf->name,
                 'slug' => $firstBookshelf->slug,

-            ]
+            ],

         ]]);
     }
 
         ]]);
     }
 


@@ -31,7 +37,7 @@ class ShelvesApiTest extends TestCase
         $books = Book::query()->take(2)->get();
 
         $details = [
         $books = Book::query()->take(2)->get();
 
         $details = [

-            'name' => 'My API shelf',
+            'name'        => 'My API shelf',

             'description' => 'A shelf created via the API',
         ];
 
             'description' => 'A shelf created via the API',
         ];
 


@@ -43,8 +49,8 @@ class ShelvesApiTest extends TestCase
         foreach ($books as $index => $book) {
             $this->assertDatabaseHas('bookshelves_books', [
                 'bookshelf_id' => $newItem->id,
         foreach ($books as $index => $book) {
             $this->assertDatabaseHas('bookshelves_books', [
                 'bookshelf_id' => $newItem->id,

-                'book_id' => $book->id,
-                'order' => $index,
+                'book_id'      => $book->id,
+                'order'        => $index,

             ]);
         }
     }
             ]);
         }
     }


@@ -59,12 +65,12 @@ class ShelvesApiTest extends TestCase
         $resp = $this->postJson($this->baseEndpoint, $details);
         $resp->assertStatus(422);
         $resp->assertJson([
         $resp = $this->postJson($this->baseEndpoint, $details);
         $resp->assertStatus(422);
         $resp->assertJson([

-            "error" => [
-                "message" => "The given data was invalid.",
-                "validation" => [
-                    "name" => ["The name field is required."]
+            'error' => [
+                'message'    => 'The given data was invalid.',
+                'validation' => [
+                    'name' => ['The name field is required.'],

                 ],
                 ],

-                "code" => 422,
+                'code' => 422,

             ],
         ]);
     }
             ],
         ]);
     }


@@ -78,8 +84,8 @@ class ShelvesApiTest extends TestCase
 
         $resp->assertStatus(200);
         $resp->assertJson([
 
         $resp->assertStatus(200);
         $resp->assertJson([

-            'id' => $shelf->id,
-            'slug' => $shelf->slug,
+            'id'         => $shelf->id,
+            'slug'       => $shelf->slug,

             'created_by' => [
                 'name' => $shelf->createdBy->name,
             ],
             'created_by' => [
                 'name' => $shelf->createdBy->name,
             ],


@@ -87,7 +93,7 @@ class ShelvesApiTest extends TestCase
                 'name' => $shelf->createdBy->name,
             ],
             'owned_by' => [
                 'name' => $shelf->createdBy->name,
             ],
             'owned_by' => [

-                'name' => $shelf->ownedBy->name
+                'name' => $shelf->ownedBy->name,

             ],
         ]);
     }
             ],
         ]);
     }


@@ -97,7 +103,7 @@ class ShelvesApiTest extends TestCase
         $this->actingAsApiEditor();
         $shelf = Bookshelf::visible()->first();
         $details = [
         $this->actingAsApiEditor();
         $shelf = Bookshelf::visible()->first();
         $details = [

-            'name' => 'My updated API shelf',
+            'name'        => 'My updated API shelf',

             'description' => 'A shelf created via the API',
         ];
 
             'description' => 'A shelf created via the API',
         ];
 


@@ -109,6 +115,21 @@ class ShelvesApiTest extends TestCase
         $this->assertActivityExists('bookshelf_update', $shelf);
     }
 
         $this->assertActivityExists('bookshelf_update', $shelf);
     }
 

+    public function test_update_increments_updated_date_if_only_tags_are_sent()
+    {
+        $this->actingAsApiEditor();
+        $shelf = Bookshelf::visible()->first();
+        DB::table('bookshelves')->where('id', '=', $shelf->id)->update(['updated_at' => Carbon::now()->subWeek()]);
+
+        $details = [
+            'tags' => [['name' => 'Category', 'value' => 'Testing']],
+        ];
+
+        $this->putJson($this->baseEndpoint . "/{$shelf->id}", $details);
+        $shelf->refresh();
+        $this->assertGreaterThan(Carbon::now()->subDay()->unix(), $shelf->updated_at->unix());
+    }
+

     public function test_update_only_assigns_books_if_param_provided()
     {
         $this->actingAsApiEditor();
     public function test_update_only_assigns_books_if_param_provided()
     {
         $this->actingAsApiEditor();


@@ -127,6 +148,42 @@ class ShelvesApiTest extends TestCase
         $this->assertTrue($shelf->books()->count() === 0);
     }
 
         $this->assertTrue($shelf->books()->count() === 0);
     }
 

+    public function test_update_cover_image_control()
+    {
+        $this->actingAsApiEditor();
+        /** @var Book $shelf */
+        $shelf = Bookshelf::visible()->first();
+        $this->assertNull($shelf->cover);
+        $file = $this->getTestImage('image.png');
+
+        // Ensure cover image can be set via API
+        $resp = $this->call('PUT', $this->baseEndpoint . "/{$shelf->id}", [
+            'name'  => 'My updated API shelf with image',
+        ], [], ['image' => $file]);
+        $shelf->refresh();
+
+        $resp->assertStatus(200);
+        $this->assertNotNull($shelf->cover);
+
+        // Ensure further updates without image do not clear cover image
+        $resp = $this->put($this->baseEndpoint . "/{$shelf->id}", [
+            'name' => 'My updated shelf again',
+        ]);
+        $shelf->refresh();
+
+        $resp->assertStatus(200);
+        $this->assertNotNull($shelf->cover);
+
+        // Ensure update with null image property clears image
+        $resp = $this->put($this->baseEndpoint . "/{$shelf->id}", [
+            'image' => null,
+        ]);
+        $shelf->refresh();
+
+        $resp->assertStatus(200);
+        $this->assertNull($shelf->cover);
+    }
+

     public function test_delete_endpoint()
     {
         $this->actingAsApiEditor();
     public function test_delete_endpoint()
     {
         $this->actingAsApiEditor();


@@ -136,4 +193,4 @@ class ShelvesApiTest extends TestCase
         $resp->assertStatus(204);
         $this->assertActivityExists('bookshelf_delete');
     }
         $resp->assertStatus(204);
         $this->assertActivityExists('bookshelf_delete');
     }

-}
\ No newline at end of file
+}