X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/ee24635e06a8c01d751f80caba47c57f76e8989d..refs/pull/4322/head:/tests/Entity/ExportTest.php
diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 0d13d208e..2b5244bf0 100644
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -2,7 +2,6 @@
namespace Tests\Entity;
-use BookStack\Auth\Role;
use BookStack\Entities\Models\Book;
use BookStack\Entities\Models\Chapter;
use BookStack\Entities\Models\Page;
@@ -15,7 +14,7 @@ class ExportTest extends TestCase
{
public function test_page_text_export()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$this->asEditor();
$resp = $this->get($page->getUrl('/export/plaintext'));
@@ -26,7 +25,7 @@ class ExportTest extends TestCase
public function test_page_pdf_export()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$this->asEditor();
$resp = $this->get($page->getUrl('/export/pdf'));
@@ -36,7 +35,7 @@ class ExportTest extends TestCase
public function test_page_html_export()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$this->asEditor();
$resp = $this->get($page->getUrl('/export/html'));
@@ -47,7 +46,7 @@ class ExportTest extends TestCase
public function test_book_text_export()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$book = $page->book;
$this->asEditor();
@@ -60,7 +59,7 @@ class ExportTest extends TestCase
public function test_book_pdf_export()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$book = $page->book;
$this->asEditor();
@@ -71,7 +70,7 @@ class ExportTest extends TestCase
public function test_book_html_export()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$book = $page->book;
$this->asEditor();
@@ -85,7 +84,7 @@ class ExportTest extends TestCase
public function test_book_html_export_shows_chapter_descriptions()
{
$chapterDesc = 'My custom test chapter description ' . Str::random(12);
- $chapter = Chapter::query()->first();
+ $chapter = $this->entities->chapter();
$chapter->description = $chapterDesc;
$chapter->save();
@@ -98,7 +97,7 @@ class ExportTest extends TestCase
public function test_chapter_text_export()
{
- $chapter = Chapter::query()->first();
+ $chapter = $this->entities->chapter();
$page = $chapter->pages[0];
$this->asEditor();
@@ -111,7 +110,7 @@ class ExportTest extends TestCase
public function test_chapter_pdf_export()
{
- $chapter = Chapter::query()->first();
+ $chapter = $this->entities->chapter();
$this->asEditor();
$resp = $this->get($chapter->getUrl('/export/pdf'));
@@ -121,7 +120,7 @@ class ExportTest extends TestCase
public function test_chapter_html_export()
{
- $chapter = Chapter::query()->first();
+ $chapter = $this->entities->chapter();
$page = $chapter->pages[0];
$this->asEditor();
@@ -134,7 +133,7 @@ class ExportTest extends TestCase
public function test_page_html_export_contains_custom_head_if_set()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$customHeadContent = '';
$this->setSettings(['app-custom-head' => $customHeadContent]);
@@ -145,7 +144,7 @@ class ExportTest extends TestCase
public function test_page_html_export_does_not_break_with_only_comments_in_custom_head()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$customHeadContent = '';
$this->setSettings(['app-custom-head' => $customHeadContent]);
@@ -157,18 +156,18 @@ class ExportTest extends TestCase
public function test_page_html_export_use_absolute_dates()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$resp = $this->asEditor()->get($page->getUrl('/export/html'));
- $resp->assertSee($page->created_at->formatLocalized('%e %B %Y %H:%M:%S'));
+ $resp->assertSee($page->created_at->isoFormat('D MMMM Y HH:mm:ss'));
$resp->assertDontSee($page->created_at->diffForHumans());
- $resp->assertSee($page->updated_at->formatLocalized('%e %B %Y %H:%M:%S'));
+ $resp->assertSee($page->updated_at->isoFormat('D MMMM Y HH:mm:ss'));
$resp->assertDontSee($page->updated_at->diffForHumans());
}
public function test_page_export_does_not_include_user_or_revision_links()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$resp = $this->asEditor()->get($page->getUrl('/export/html'));
$resp->assertDontSee($page->getUrl('/revisions'));
@@ -178,7 +177,7 @@ class ExportTest extends TestCase
public function test_page_export_sets_right_data_type_for_svg_embeds()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
Storage::disk('local')->makeDirectory('uploads/images/gallery');
Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '');
$page->html = ' Content!';
@@ -194,7 +193,7 @@ class ExportTest extends TestCase
public function test_page_image_containment_works_on_multiple_images_within_a_single_line()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
Storage::disk('local')->makeDirectory('uploads/images/gallery');
Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '');
Storage::disk('local')->put('uploads/images/gallery/svg_test2.svg', '');
@@ -210,7 +209,7 @@ class ExportTest extends TestCase
public function test_page_export_contained_html_image_fetches_only_run_when_url_points_to_image_upload_folder()
{
- $page = Page::query()->first();
+ $page = $this->entities->page();
$page->html = '
'
. '
'
. '
';
@@ -235,7 +234,7 @@ class ExportTest extends TestCase
$contents = file_get_contents(public_path('.htaccess'));
config()->set('filesystems.images', 'local');
- $page = Page::query()->first();
+ $page = $this->entities->page();
$page->html = '
';
$page->save();
@@ -249,7 +248,7 @@ class ExportTest extends TestCase
config()->set('filesystems.images', 'local_secure');
file_put_contents($testFilePath, 'I am a cat');
- $page = Page::query()->first();
+ $page = $this->entities->page();
$page->html = '
';
$page->save();
@@ -275,8 +274,8 @@ class ExportTest extends TestCase
public function test_page_export_with_deleted_creator_and_updater()
{
- $user = $this->getViewer(['name' => 'ExportWizardTheFifth']);
- $page = Page::query()->first();
+ $user = $this->users->viewer(['name' => 'ExportWizardTheFifth']);
+ $page = $this->entities->page();
$page->created_by = $user->id;
$page->updated_by = $user->id;
$page->save();
@@ -311,7 +310,7 @@ class ExportTest extends TestCase
public function test_page_pdf_export_opens_details_blocks()
{
- $page = Page::query()->first()->forceFill([
+ $page = $this->entities->page()->forceFill([
'html' => '
Hello
Some bold text
', ]); @@ -364,7 +363,7 @@ class ExportTest extends TestCase public function test_chapter_markdown_export() { - $chapter = Chapter::query()->first(); + $chapter = $this->entities->chapter(); $page = $chapter->pages()->first(); $resp = $this->asEditor()->get($chapter->getUrl('/export/markdown')); @@ -409,7 +408,7 @@ class ExportTest extends TestCase $chapter = $book->chapters()->first(); $page = $chapter->pages()->first(); $entities = [$book, $chapter, $page]; - $user = $this->getViewer(); + $user = $this->users->viewer(); $this->actingAs($user); foreach ($entities as $entity) { @@ -417,8 +416,7 @@ class ExportTest extends TestCase $resp->assertSee('/export/pdf'); } - /** @var Role $role */ - $this->removePermissionFromUser($user, 'content-export'); + $this->permissions->removeUserRolePermissions($user, ['content-export']); foreach ($entities as $entity) { $resp = $this->get($entity->getUrl()); @@ -430,8 +428,7 @@ class ExportTest extends TestCase public function test_wkhtmltopdf_only_used_when_allow_untrusted_is_true() { - /** @var Page $page */ - $page = Page::query()->first(); + $page = $this->entities->page(); config()->set('snappy.pdf.binary', '/abc123'); config()->set('app.allow_untrusted_server_fetching', false); @@ -447,9 +444,9 @@ class ExportTest extends TestCase public function test_html_exports_contain_csp_meta_tag() { $entities = [ - Page::query()->first(), - Book::query()->first(), - Chapter::query()->first(), + $this->entities->page(), + $this->entities->book(), + $this->entities->chapter(), ]; foreach ($entities as $entity) { @@ -460,7 +457,7 @@ class ExportTest extends TestCase public function test_html_exports_contain_body_classes_for_export_identification() { - $page = Page::query()->first(); + $page = $this->entities->page(); $resp = $this->asEditor()->get($page->getUrl('/export/html')); $this->withHtml($resp)->assertElementExists('body.export.export-format-html.export-engine-none');