Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 05:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated tests to align with recent list changes

Browse Source
This commit is contained in:
Dan Brown 2022-11-01 14:53:36 +00:00
parent d4e71e431b
commit f809bd3a62
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/HomeController.php
View File

@ -10,13 +10,15 @@ use BookStack\Entities\Queries\TopFavourites;
use BookStack\Entities\Repos\BookRepo; use BookStack\Entities\Repos\BookRepo;
use BookStack\Entities\Repos\BookshelfRepo; use BookStack\Entities\Repos\BookshelfRepo;
use BookStack\Entities\Tools\PageContent; use BookStack\Entities\Tools\PageContent;
use BookStack\Util\SimpleListOptions;
use Illuminate\Http\Request;
class HomeController extends Controller class HomeController extends Controller
{ {
/** /**
* Display the homepage. * Display the homepage.
*/ */
public function index(ActivityQueries $activities) public function index(Request $request, ActivityQueries $activities)
{ {
$activity = $activities->latest(10); $activity = $activities->latest(10);
$draftPages = []; $draftPages = [];
@ -61,33 +63,27 @@ class HomeController extends Controller
if ($homepageOption === 'bookshelves' || $homepageOption === 'books') { if ($homepageOption === 'bookshelves' || $homepageOption === 'books') {
$key = $homepageOption; $key = $homepageOption;
$view = setting()->getForCurrentUser($key . '_view_type'); $view = setting()->getForCurrentUser($key . '_view_type');
$sort = setting()->getForCurrentUser($key . '_sort', 'name'); $listOptions = SimpleListOptions::fromRequest($request, $key)->withSortOptions([
$order = setting()->getForCurrentUser($key . '_sort_order', 'asc'); 'name' => trans('common.sort_name'),
$sortOptions = [
'name' => trans('common.sort_name'),
'created_at' => trans('common.sort_created_at'), 'created_at' => trans('common.sort_created_at'),
'updated_at' => trans('common.sort_updated_at'), 'updated_at' => trans('common.sort_updated_at'),
]; ]);
$commonData = array_merge($commonData, [ $commonData = array_merge($commonData, [
'view' => $view, 'view' => $view,
'sort' => $sort, 'listOptions' => $listOptions,
'order' => $order,
'sortOptions' => $sortOptions,
]); ]);
} }
if ($homepageOption === 'bookshelves') { if ($homepageOption === 'bookshelves') {
$shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['sort'], $commonData['order']); $shelves = app(BookshelfRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
$data = array_merge($commonData, ['shelves' => $shelves]); $data = array_merge($commonData, ['shelves' => $shelves]);
return view('home.shelves', $data); return view('home.shelves', $data);
} }
if ($homepageOption === 'books') { if ($homepageOption === 'books') {
$bookRepo = app(BookRepo::class); $books = app(BookRepo::class)->getAllPaginated(18, $commonData['listOptions']->getSort(), $commonData['listOptions']->getOrder());
$books = $bookRepo->getAllPaginated(18, $commonData['sort'], $commonData['order']);
$data = array_merge($commonData, ['books' => $books]); $data = array_merge($commonData, ['books' => $books]);
return view('home.books', $data); return view('home.books', $data);

2
tests/Actions/AuditLogTest.php
View File

@ -51,7 +51,7 @@ class AuditLogTest extends TestCase
$resp->assertSeeText($page->name); $resp->assertSeeText($page->name);
$resp->assertSeeText('page_create'); $resp->assertSeeText('page_create');
$resp->assertSeeText($activity->created_at->toDateTimeString()); $resp->assertSeeText($activity->created_at->toDateTimeString());
$this->withHtml($resp)->assertElementContains('.table-user-item', $admin->name); $this->withHtml($resp)->assertElementContains('a[href*="users/' . $admin->id . '"]', $admin->name);
} }
public function test_shows_name_for_deleted_items() public function test_shows_name_for_deleted_items()

6
tests/Entity/PageRevisionTest.php
View File

@ -195,12 +195,12 @@ class PageRevisionTest extends TestCase
$this->createRevisions($page, 1, ['html' => 'new page html']); $this->createRevisions($page, 1, ['html' => 'new page html']);
$resp = $this->asAdmin()->get($page->refresh()->getUrl('/revisions')); $resp = $this->asAdmin()->get($page->refresh()->getUrl('/revisions'));
$this->withHtml($resp)->assertElementContains('td', '(WYSIWYG)'); $this->withHtml($resp)->assertElementContains('.item-list-row > div:nth-child(2)', 'WYSIWYG)');
$this->withHtml($resp)->assertElementNotContains('td', '(Markdown)'); $this->withHtml($resp)->assertElementNotContains('.item-list-row > div:nth-child(2)', 'Markdown)');
$this->createRevisions($page, 1, ['markdown' => '# Some markdown content']); $this->createRevisions($page, 1, ['markdown' => '# Some markdown content']);
$resp = $this->get($page->refresh()->getUrl('/revisions')); $resp = $this->get($page->refresh()->getUrl('/revisions'));
$this->withHtml($resp)->assertElementContains('td', '(Markdown)'); $this->withHtml($resp)->assertElementContains('.item-list-row > div:nth-child(2)', 'Markdown)');
} }
public function test_revision_restore_action_only_visible_with_permission() public function test_revision_restore_action_only_visible_with_permission()

2
tests/Entity/TagTest.php
View File

@ -164,7 +164,7 @@ class TagTest extends TestCase
$resp->assertSee('OtherTestContent'); $resp->assertSee('OtherTestContent');
$resp->assertDontSee('OtherTagName'); $resp->assertDontSee('OtherTagName');
$resp->assertSee('Active Filter:'); $resp->assertSee('Active Filter:');
$this->withHtml($resp)->assertElementCount('table .tag-item', 2); $this->withHtml($resp)->assertElementCount('.item-list .tag-item', 2);
$this->withHtml($resp)->assertElementContains('form[action$="/tags"]', 'Clear Filter'); $this->withHtml($resp)->assertElementContains('form[action$="/tags"]', 'Clear Filter');
} }

10
tests/Settings/RecycleBinTest.php
View File

@ -62,11 +62,11 @@ class RecycleBinTest extends TestCase
$viewReq = $this->asAdmin()->get('/settings/recycle-bin'); $viewReq = $this->asAdmin()->get('/settings/recycle-bin');
$html = $this->withHtml($viewReq); $html = $this->withHtml($viewReq);
$html->assertElementContains('table.table', $page->name); $html->assertElementContains('.item-list-row', $page->name);
$html->assertElementContains('table.table', $editor->name); $html->assertElementContains('.item-list-row', $editor->name);
$html->assertElementContains('table.table', $book->name); $html->assertElementContains('.item-list-row', $book->name);
$html->assertElementContains('table.table', $book->pages_count . ' Pages'); $html->assertElementContains('.item-list-row', $book->pages_count . ' Pages');
$html->assertElementContains('table.table', $book->chapters_count . ' Chapters'); $html->assertElementContains('.item-list-row', $book->chapters_count . ' Chapters');
} }
public function test_recycle_bin_empty() public function test_recycle_bin_empty()

15
tests/User/UserPreferencesTest.php
View File

@ -29,21 +29,6 @@ class UserPreferencesTest extends TestCase
$this->assertEquals('desc', setting()->getForCurrentUser('books_sort_order')); $this->assertEquals('desc', setting()->getForCurrentUser('books_sort_order'));
} }
public function test_update_sort_preference_defaults()
{
$editor = $this->getEditor();
$this->actingAs($editor);
$updateRequest = $this->patch('/settings/users/' . $editor->id . '/change-sort/bookshelves', [
'sort' => 'cat',
'order' => 'dog',
]);
$updateRequest->assertStatus(302);
$this->assertEquals('name', setting()->getForCurrentUser('bookshelves_sort'));
$this->assertEquals('asc', setting()->getForCurrentUser('bookshelves_sort_order'));
}
public function test_update_sort_bad_entity_type_handled() public function test_update_sort_bad_entity_type_handled()
{ {
$editor = $this->getEditor(); $editor = $this->getEditor();