Fixed revision-based redirect on new pages

diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php
index d3a0603637683fee392590135ea4b767698f3e9d..d3b71cebd1b895e941adc8e07acb61f7c72c8baa 100644 (file)
--- a/app/Repos/PageRepo.php
+++ b/app/Repos/PageRepo.php
@@ -157,6 +157,8 @@ class PageRepo extends EntityRepo
         $draftPage->draft = false;
 
         $draftPage->save();
         $draftPage->draft = false;
 
         $draftPage->save();

+        $this->saveRevision($draftPage, 'Initial Publish');
+        

         return $draftPage;
     }
 
         return $draftPage;
     }
 

diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php
index 3bf6a3f2ac76ed88b56739a3459210c367c818ed..8c0c286a6c271939567eb73445df77e9c94ff775 100644 (file)
--- a/tests/Entity/EntityTest.php
+++ b/tests/Entity/EntityTest.php
@@ -216,13 +216,24 @@ class EntityTest extends TestCase
 
     public function test_old_page_slugs_redirect_to_new_pages()
     {
 
     public function test_old_page_slugs_redirect_to_new_pages()
     {

-        $page = \BookStack\Page::all()->first();
+        $page = \BookStack\Page::first();

         $pageUrl = $page->getUrl();
         $newPageUrl = '/books/' . $page->book->slug . '/page/super-test-page';
         $pageUrl = $page->getUrl();
         $newPageUrl = '/books/' . $page->book->slug . '/page/super-test-page';

+        // Need to save twice since revisions are not generated in seeder.

         $this->asAdmin()->visit($pageUrl)
         $this->asAdmin()->visit($pageUrl)

+            ->clickInElement('#content', 'Edit')
+            ->type('super test', '#name')
+            ->press('Save Page');
+
+        $page = \BookStack\Page::first();
+        $pageUrl = $page->getUrl();
+
+        // Second Save
+        $this->visit($pageUrl)

             ->clickInElement('#content', 'Edit')
             ->type('super test page', '#name')
             ->press('Save Page')
             ->clickInElement('#content', 'Edit')
             ->type('super test page', '#name')
             ->press('Save Page')

+            // Check redirect

             ->seePageIs($newPageUrl)
             ->visit($pageUrl)
             ->seePageIs($newPageUrl);
             ->seePageIs($newPageUrl)
             ->visit($pageUrl)
             ->seePageIs($newPageUrl);