BookStack Code Mirror - bookstack/blobdiff - tests/Entity/BookShelfTest.php

diff --git a/tests/Entity/BookShelfTest.php b/tests/Entity/BookShelfTest.php

index 60658f6b2b8a87ecf36609a32f79bda7b46434e6..fcbc17ea94ba40ce4c0c89f811234cc829786bd3 100644 (file)

--- a/tests/Entity/BookShelfTest.php

+++ b/tests/Entity/BookShelfTest.php

@@ -1,4 +1,6 @@

-<?php namespace Tests\Entity;

+<?php

+

+namespace Tests\Entity;

use BookStack\Auth\User;

use BookStack\Entities\Models\Book;

@@ -10,7 +12,6 @@ use Tests\Uploads\UsesImages;

class BookShelfTest extends TestCase

{

-

use UsesImages;

public function test_shelves_shows_in_header_if_have_view_permissions()

@@ -36,7 +37,7 @@ class BookShelfTest extends TestCase

public function test_shelves_shows_in_header_if_have_any_shelve_view_permission()

{

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

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

$this->giveUserPermissions($user, ['image-create-all']);

$shelf = Bookshelf::first();

$userRole = $user->roles()->first();

@@ -79,16 +80,16 @@ class BookShelfTest extends TestCase

{

$booksToInclude = Book::take(2)->get();

$shelfInfo = [

- 'name' => 'My test book' . Str::random(4),

- 'description' => 'Test book description ' . Str::random(10)

+ 'name' => 'My test book' . Str::random(4),

+ 'description' => 'Test book description ' . Str::random(10),

];

$resp = $this->asEditor()->post('/shelves', array_merge($shelfInfo, [

'books' => $booksToInclude->implode('id', ','),

- 'tags' => [

+ 'tags' => [

[

- 'name' => 'Test Category',

+ 'name' => 'Test Category',

'value' => 'Test Tag Value',

- ]

+ ],

],

]));

$resp->assertRedirect();

@@ -109,8 +110,8 @@ class BookShelfTest extends TestCase

public function test_shelves_create_sets_cover_image()

{

$shelfInfo = [

- 'name' => 'My test book' . Str::random(4),

- 'description' => 'Test book description ' . Str::random(10)

+ 'name' => 'My test book' . Str::random(4),

+ 'description' => 'Test book description ' . Str::random(10),

];

$imageFile = $this->getTestImage('shelf-test.png');

@@ -120,7 +121,7 @@ class BookShelfTest extends TestCase

$lastImage = Image::query()->orderByDesc('id')->firstOrFail();

$shelf = Bookshelf::query()->where('name', '=', $shelfInfo['name'])->first();

$this->assertDatabaseHas('bookshelves', [

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

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

'image_id' => $lastImage->id,

]);

$this->assertEquals($lastImage->id, $shelf->cover->id);

@@ -175,7 +176,7 @@ class BookShelfTest extends TestCase

// Set book ordering

$this->asAdmin()->put($shelf->getUrl(), [

'books' => $books->implode('id', ','),

- 'tags' => [], 'description' => 'abc', 'name' => 'abc'

+ 'tags' => [], 'description' => 'abc', 'name' => 'abc',

]);

$this->assertEquals(3, $shelf->books()->count());

$shelf->refresh();

@@ -205,17 +206,17 @@ class BookShelfTest extends TestCase

$booksToInclude = Book::take(2)->get();

$shelfInfo = [

- 'name' => 'My test book' . Str::random(4),

- 'description' => 'Test book description ' . Str::random(10)

+ 'name' => 'My test book' . Str::random(4),

+ 'description' => 'Test book description ' . Str::random(10),

];

$resp = $this->asEditor()->put($shelf->getUrl(), array_merge($shelfInfo, [

'books' => $booksToInclude->implode('id', ','),

- 'tags' => [

+ 'tags' => [

[

- 'name' => 'Test Category',

+ 'name' => 'Test Category',

'value' => 'Test Tag Value',

- ]

+ ],

],

]));

$shelf = Bookshelf::find($shelf->id);

@@ -246,15 +247,15 @@ class BookShelfTest extends TestCase

$testName = 'Test Book in Shelf Name';

$createBookResp = $this->asEditor()->post($shelf->getUrl('/create-book'), [

- 'name' => $testName,

- 'description' => 'Book in shelf description'

+ 'name' => $testName,

+ 'description' => 'Book in shelf description',

]);

$createBookResp->assertRedirect();

$newBook = Book::query()->orderBy('id', 'desc')->first();

$this->assertDatabaseHas('bookshelves_books', [

'bookshelf_id' => $shelf->id,

- 'book_id' => $newBook->id,

+ 'book_id' => $newBook->id,

]);

$resp = $this->asEditor()->get($shelf->getUrl());

@@ -289,24 +290,31 @@ class BookShelfTest extends TestCase

$shelf = Bookshelf::first();

$resp = $this->asAdmin()->get($shelf->getUrl('/permissions'));

$resp->assertSeeText('Copy Permissions');

- $resp->assertSee("action=\"{$shelf->getUrl('/copy-permissions')}\"");

+ $resp->assertSee("action=\"{$shelf->getUrl('/copy-permissions')}\"", false);

$child = $shelf->books()->first();

$editorRole = $this->getEditor()->roles()->first();

- $this->assertFalse(boolval($child->restricted), "Child book should not be restricted by default");

- $this->assertTrue($child->permissions()->count() === 0, "Child book should have no permissions by default");

+ $this->assertFalse(boolval($child->restricted), 'Child book should not be restricted by default');

+ $this->assertTrue($child->permissions()->count() === 0, 'Child book should have no permissions by default');

$this->setEntityRestrictions($shelf, ['view', 'update'], [$editorRole]);

$resp = $this->post($shelf->getUrl('/copy-permissions'));

$child = $shelf->books()->first();

$resp->assertRedirect($shelf->getUrl());

- $this->assertTrue(boolval($child->restricted), "Child book should now be restricted");

- $this->assertTrue($child->permissions()->count() === 2, "Child book should have copied permissions");

+ $this->assertTrue(boolval($child->restricted), 'Child book should now be restricted');

+ $this->assertTrue($child->permissions()->count() === 2, 'Child book should have copied permissions');

$this->assertDatabaseHas('entity_permissions', ['restrictable_id' => $child->id, 'action' => 'view', 'role_id' => $editorRole->id]);

$this->assertDatabaseHas('entity_permissions', ['restrictable_id' => $child->id, 'action' => 'update', 'role_id' => $editorRole->id]);

}

+ public function test_permission_page_has_a_warning_about_no_cascading()

+ {

+ $shelf = Bookshelf::first();

+ $resp = $this->asAdmin()->get($shelf->getUrl('/permissions'));

+ $resp->assertSeeText('Permissions on bookshelves do not automatically cascade to contained books.');

+ }

+

public function test_bookshelves_show_in_breadcrumbs_if_in_context()

{

$shelf = Bookshelf::first();

@@ -337,8 +345,8 @@ class BookShelfTest extends TestCase

{

// Create shelf

$shelfInfo = [

- 'name' => 'My test shelf' . Str::random(4),

- 'description' => 'Test shelf description ' . Str::random(10)

+ 'name' => 'My test shelf' . Str::random(4),

+ 'description' => 'Test shelf description ' . Str::random(10),

];

$this->asEditor()->post('/shelves', $shelfInfo);

@@ -346,8 +354,8 @@ class BookShelfTest extends TestCase

// Create book and add to shelf

$this->asEditor()->post($shelf->getUrl('/create-book'), [

- 'name' => 'Test book name',

- 'description' => 'Book in shelf description'

+ 'name' => 'Test book name',

+ 'description' => 'Book in shelf description',

]);

$newBook = Book::query()->orderBy('id', 'desc')->first();

@@ -361,4 +369,12 @@ class BookShelfTest extends TestCase

$resp = $this->asEditor()->get($newBook->getUrl());

$resp->assertDontSee($shelfInfo['name']);

}

+

+ public function test_cancel_on_child_book_creation_returns_to_original_shelf()

+ {

+ /** @var Bookshelf $shelf */

+ $shelf = Bookshelf::query()->first();

+ $resp = $this->asEditor()->get($shelf->getUrl('/create-book'));

+ $resp->assertElementContains('form a[href="' . $shelf->getUrl() . '"]', 'Cancel');

+ }

}