Fixed OIDC Logout

[bookstack] / tests / Entity / ExportTest.php

diff --git a/tests/Entity/ExportTest.php b/tests/Entity/ExportTest.php
index 0d13d208e9f0409fe2006c4471e1ea738a5008d9..2b5244bf010510dde94191ac8dc21c87465218cb 100644 (file)
--- a/tests/Entity/ExportTest.php
+++ b/tests/Entity/ExportTest.php
@@ -2,7 +2,6 @@
 
 namespace Tests\Entity;
 
 
 namespace Tests\Entity;
 

-use BookStack\Auth\Role;

 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Page;
 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()
     {
 {
     public function test_page_text_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $this->asEditor();
 
         $resp = $this->get($page->getUrl('/export/plaintext'));
         $this->asEditor();
 
         $resp = $this->get($page->getUrl('/export/plaintext'));


@@ -26,7 +25,7 @@ class ExportTest extends TestCase
 
     public function test_page_pdf_export()
     {
 
     public function test_page_pdf_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $this->asEditor();
 
         $resp = $this->get($page->getUrl('/export/pdf'));
         $this->asEditor();
 
         $resp = $this->get($page->getUrl('/export/pdf'));


@@ -36,7 +35,7 @@ class ExportTest extends TestCase
 
     public function test_page_html_export()
     {
 
     public function test_page_html_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $this->asEditor();
 
         $resp = $this->get($page->getUrl('/export/html'));
         $this->asEditor();
 
         $resp = $this->get($page->getUrl('/export/html'));


@@ -47,7 +46,7 @@ class ExportTest extends TestCase
 
     public function test_book_text_export()
     {
 
     public function test_book_text_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $book = $page->book;
         $this->asEditor();
 
         $book = $page->book;
         $this->asEditor();
 


@@ -60,7 +59,7 @@ class ExportTest extends TestCase
 
     public function test_book_pdf_export()
     {
 
     public function test_book_pdf_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $book = $page->book;
         $this->asEditor();
 
         $book = $page->book;
         $this->asEditor();
 


@@ -71,7 +70,7 @@ class ExportTest extends TestCase
 
     public function test_book_html_export()
     {
 
     public function test_book_html_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $book = $page->book;
         $this->asEditor();
 
         $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);
     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();
 
         $chapter->description = $chapterDesc;
         $chapter->save();
 


@@ -98,7 +97,7 @@ class ExportTest extends TestCase
 
     public function test_chapter_text_export()
     {
 
     public function test_chapter_text_export()
     {

-        $chapter = Chapter::query()->first();
+        $chapter = $this->entities->chapter();

         $page = $chapter->pages[0];
         $this->asEditor();
 
         $page = $chapter->pages[0];
         $this->asEditor();
 


@@ -111,7 +110,7 @@ class ExportTest extends TestCase
 
     public function test_chapter_pdf_export()
     {
 
     public function test_chapter_pdf_export()
     {

-        $chapter = Chapter::query()->first();
+        $chapter = $this->entities->chapter();

         $this->asEditor();
 
         $resp = $this->get($chapter->getUrl('/export/pdf'));
         $this->asEditor();
 
         $resp = $this->get($chapter->getUrl('/export/pdf'));


@@ -121,7 +120,7 @@ class ExportTest extends TestCase
 
     public function test_chapter_html_export()
     {
 
     public function test_chapter_html_export()
     {

-        $chapter = Chapter::query()->first();
+        $chapter = $this->entities->chapter();

         $page = $chapter->pages[0];
         $this->asEditor();
 
         $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()
     {
 
     public function test_page_html_export_contains_custom_head_if_set()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

 
         $customHeadContent = '<style>p{color: red;}</style>';
         $this->setSettings(['app-custom-head' => $customHeadContent]);
 
         $customHeadContent = '<style>p{color: red;}</style>';
         $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()
     {
 
     public function test_page_html_export_does_not_break_with_only_comments_in_custom_head()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

 
         $customHeadContent = '<!-- A comment -->';
         $this->setSettings(['app-custom-head' => $customHeadContent]);
 
         $customHeadContent = '<!-- A comment -->';
         $this->setSettings(['app-custom-head' => $customHeadContent]);


@@ -157,18 +156,18 @@ class ExportTest extends TestCase
 
     public function test_page_html_export_use_absolute_dates()
     {
 
     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 = $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->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()
     {
         $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'));
 
         $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()
     {
 
     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', '<svg></svg>');
         $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg">';
         Storage::disk('local')->makeDirectory('uploads/images/gallery');
         Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
         $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg">';


@@ -194,7 +193,7 @@ class ExportTest extends TestCase
 
     public function test_page_image_containment_works_on_multiple_images_within_a_single_line()
     {
 
     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', '<svg></svg>');
         Storage::disk('local')->put('uploads/images/gallery/svg_test2.svg', '<svg></svg>');
         Storage::disk('local')->makeDirectory('uploads/images/gallery');
         Storage::disk('local')->put('uploads/images/gallery/svg_test.svg', '<svg></svg>');
         Storage::disk('local')->put('uploads/images/gallery/svg_test2.svg', '<svg></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()
     {
 
     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 = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>'
             . '<img src="http://localhost/uploads/svg_test.svg"/>'
             . '<img src="/uploads/svg_test.svg"/>';
         $page->html = '<img src="http://localhost/uploads/images/gallery/svg_test.svg"/>'
             . '<img src="http://localhost/uploads/svg_test.svg"/>'
             . '<img src="/uploads/svg_test.svg"/>';


@@ -235,7 +234,7 @@ class ExportTest extends TestCase
         $contents = file_get_contents(public_path('.htaccess'));
         config()->set('filesystems.images', 'local');
 
         $contents = file_get_contents(public_path('.htaccess'));
         config()->set('filesystems.images', 'local');
 

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '<img src="http://localhost/uploads/images/../../.htaccess"/>';
         $page->save();
 
         $page->html = '<img src="http://localhost/uploads/images/../../.htaccess"/>';
         $page->save();
 


@@ -249,7 +248,7 @@ class ExportTest extends TestCase
         config()->set('filesystems.images', 'local_secure');
         file_put_contents($testFilePath, 'I am a cat');
 
         config()->set('filesystems.images', 'local_secure');
         file_put_contents($testFilePath, 'I am a cat');
 

-        $page = Page::query()->first();
+        $page = $this->entities->page();

         $page->html = '<img src="http://localhost/uploads/images/../../logs/test.txt"/>';
         $page->save();
 
         $page->html = '<img src="http://localhost/uploads/images/../../logs/test.txt"/>';
         $page->save();
 


@@ -275,8 +274,8 @@ class ExportTest extends TestCase
 
     public function test_page_export_with_deleted_creator_and_updater()
     {
 
     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();
         $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()
     {
 
     public function test_page_pdf_export_opens_details_blocks()
     {

-        $page = Page::query()->first()->forceFill([
+        $page = $this->entities->page()->forceFill([

             'html'     => '<details><summary>Hello</summary><p>Content!</p></details>',
         ]);
         $page->save();
             'html'     => '<details><summary>Hello</summary><p>Content!</p></details>',
         ]);
         $page->save();


@@ -329,7 +328,7 @@ class ExportTest extends TestCase
 
     public function test_page_markdown_export()
     {
 
     public function test_page_markdown_export()
     {

-        $page = Page::query()->first();
+        $page = $this->entities->page();

 
         $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
         $resp->assertStatus(200);
 
         $resp = $this->asEditor()->get($page->getUrl('/export/markdown'));
         $resp->assertStatus(200);


@@ -339,7 +338,7 @@ class ExportTest extends TestCase
 
     public function test_page_markdown_export_uses_existing_markdown_if_apparent()
     {
 
     public function test_page_markdown_export_uses_existing_markdown_if_apparent()
     {

-        $page = Page::query()->first()->forceFill([
+        $page = $this->entities->page()->forceFill([

             'markdown' => '# A header',
             'html'     => '<h1>Dogcat</h1>',
         ]);
             'markdown' => '# A header',
             'html'     => '<h1>Dogcat</h1>',
         ]);


@@ -352,7 +351,7 @@ class ExportTest extends TestCase
 
     public function test_page_markdown_export_converts_html_where_no_markdown()
     {
 
     public function test_page_markdown_export_converts_html_where_no_markdown()
     {

-        $page = Page::query()->first()->forceFill([
+        $page = $this->entities->page()->forceFill([

             'markdown' => '',
             'html'     => '<h1>Dogcat</h1><p>Some <strong>bold</strong> text</p>',
         ]);
             'markdown' => '',
             'html'     => '<h1>Dogcat</h1><p>Some <strong>bold</strong> text</p>',
         ]);


@@ -364,7 +363,7 @@ class ExportTest extends TestCase
 
     public function test_chapter_markdown_export()
     {
 
     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'));
 
         $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];
         $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) {
         $this->actingAs($user);
 
         foreach ($entities as $entity) {


@@ -417,8 +416,7 @@ class ExportTest extends TestCase
             $resp->assertSee('/export/pdf');
         }
 
             $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());
 
         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()
     {
 
     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);
 
         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 = [
     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) {
         ];
 
         foreach ($entities as $entity) {


@@ -460,7 +457,7 @@ class ExportTest extends TestCase
 
     public function test_html_exports_contain_body_classes_for_export_identification()
     {
 
     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');
 
         $resp = $this->asEditor()->get($page->getUrl('/export/html'));
         $this->withHtml($resp)->assertElementExists('body.export.export-format-html.export-engine-none');