From 42976ca48c8de04726e62356f76f0bbb77b2ab15 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Tue, 26 Jul 2016 18:16:40 +0100
Subject: [PATCH] Fixed revision-based redirect on new pages

---
 app/Repos/PageRepo.php      |  2 ++
 tests/Entity/EntityTest.php | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/Repos/PageRepo.php b/app/Repos/PageRepo.php
index d3a060363..d3b71cebd 100644
--- a/app/Repos/PageRepo.php
+++ b/app/Repos/PageRepo.php
@@ -157,6 +157,8 @@ class PageRepo extends EntityRepo
         $draftPage->draft = false;
 
         $draftPage->save();
+        $this->saveRevision($draftPage, 'Initial Publish');
+        
         return $draftPage;
     }
 
diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php
index 3bf6a3f2a..8c0c286a6 100644
--- 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()
     {
-        $page = \BookStack\Page::all()->first();
+        $page = \BookStack\Page::first();
         $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)
+            ->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')
+            // Check redirect
             ->seePageIs($newPageUrl)
             ->visit($pageUrl)
             ->seePageIs($newPageUrl);