NOW MANAGED ON CODEBERG
Exports: Fixed scope of pages in chapter MD export
Dan Brownf4c9d2b0492d
diff --git a/app/Exports/ExportFormatter.php b/app/Exports/ExportFormatter.phpindex ad489aba1..c5973eace 100644--- a/app/Exports/ExportFormatter.php+++ b/app/Exports/ExportFormatter.php@@ -323,7 +323,7 @@ class ExportFormatter$text .= $description . "\n\n";}- foreach ($chapter->pages as $page) {+ foreach ($chapter->getVisiblePages() as $page) {$text .= $this->pageToMarkdown($page) . "\n\n";}diff --git a/tests/Exports/MarkdownExportTest.php b/tests/Exports/MarkdownExportTest.phpindex 6bf585d59..09928ced2 100644--- a/tests/Exports/MarkdownExportTest.php+++ b/tests/Exports/MarkdownExportTest.php@@ -56,6 +56,20 @@ class MarkdownExportTest extends TestCase$resp->assertSee('My **chapter** description');}+ public function test_chapter_markdown_export_pages_are_permission_controlled()+ {+ $chapter = $this->entities->chapterHasPages();+ $page = $chapter->pages()->first();+ $page->name = 'MyPageWhichShouldNotBeFound';+ $page->save();+ $this->permissions->disableEntityInheritedPermissions($page);++ $resp = $this->asEditor()->get($chapter->getUrl('/export/markdown'));++ $resp->assertSee('# ' . $chapter->name);+ $resp->assertDontSee('MyPageWhichShouldNotBeFound');+ }+public function test_book_markdown_export(){$book = Book::query()->whereHas('pages')->whereHas('chapters')->first();@@ -76,6 +90,38 @@ class MarkdownExportTest extends TestCase$resp->assertSee('My **chapter** description');}+ public function test_book_markdown_export_chapters_are_permission_controlled()+ {+ $book = $this->entities->bookHasChaptersAndPages();+ $chapter = $book->chapters()->first();+ $page = $chapter->pages()->first();+ $page->name = 'MyPageWhichShouldNotBeFound';+ $page->save();+ $chapter->name = 'MyChapterWhichShouldNotBeFound';+ $chapter->save();+ $this->permissions->disableEntityInheritedPermissions($chapter);++ $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));++ $resp->assertSee('# ' . $book->name);+ $resp->assertDontSee('MyChapterWhichShouldNotBeFound');+ $resp->assertDontSee('MyPageWhichShouldNotBeFound');+ }++ public function test_book_markdown_export_direct_pages_are_permission_controlled()+ {+ $book = $this->entities->bookHasChaptersAndPages();+ $page = $book->directPages()->first();+ $page->name = 'MyPageWhichShouldNotBeFound';+ $page->save();+ $this->permissions->disableEntityInheritedPermissions($page);++ $resp = $this->asEditor()->get($book->getUrl('/export/markdown'));++ $resp->assertSee('# ' . $book->name);+ $resp->assertDontSee('MyPageWhichShouldNotBeFound');+ }+public function test_book_markdown_export_concats_immediate_pages_with_newlines(){/** @var Book $book */