Fixed inaccessible revisions, added regression tests

Fixes #309

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 4ed10d61e3efa2ba6ef8d1dd535040f0e68b1cc1..623cb9c4d9c4f4d7f9ca2ddb0a49e376ec9acdf5 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -369,10 +369,13 @@ class PageController extends Controller
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function showRevision($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

-        $revision = $this->entityRepo->getById('page_revision', $revisionId, false);
+        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        if ($revision === null) {
+            abort(404);
+        }

 
         $page->fill($revision->toArray());
 
         $page->fill($revision->toArray());

-        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
+        $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));

         
         return view('pages/revision', [
             'page' => $page,
         
         return view('pages/revision', [
             'page' => $page,


@@ -390,7 +393,10 @@ class PageController extends Controller
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
     public function showRevisionChanges($bookSlug, $pageSlug, $revisionId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);

-        $revision = $this->entityRepo->getById('page_revision', $revisionId);
+        $revision = $page->revisions()->where('id', '=', $revisionId)->first();
+        if ($revision === null) {
+            abort(404);
+        }

 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;
 
         $prev = $revision->getPrevious();
         $prevContent = ($prev === null) ? '' : $prev->html;

diff --git a/app/Repos/EntityRepo.php b/app/Repos/EntityRepo.php
index 8a8740d76cf6cf18faf5a9163e2f75bb0b4d5a79..7b262c3de70892c637d88d0241fadf7d745303c2 100644 (file)
--- a/app/Repos/EntityRepo.php
+++ b/app/Repos/EntityRepo.php
@@ -86,8 +86,7 @@ class EntityRepo
         $this->entities = [
             'page' => $this->page,
             'chapter' => $this->chapter,
         $this->entities = [
             'page' => $this->page,
             'chapter' => $this->chapter,

-            'book' => $this->book,
-            'page_revision' => $this->pageRevision
+            'book' => $this->book

         ];
         $this->viewService = $viewService;
         $this->permissionService = $permissionService;
         ];
         $this->viewService = $viewService;
         $this->permissionService = $permissionService;

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 4f65d3406449e3e0d42192bf494d9a35bfdb6b85..6f07b9626eb2f0d1c043d888c83c83b72878f766 100644 (file)
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -1,33 +1,56 @@
 <?php namespace Tests;
 
 <?php namespace Tests;
 

-class PageContentTest extends BrowserKitTest
+use BookStack\Page;
+use BookStack\Repos\EntityRepo;
+
+class PageContentTest extends TestCase

 {
 
     public function test_page_includes()
     {
 {
 
     public function test_page_includes()
     {

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

 
         $secondPage->html = "<p id='section1'>Hello, This is a test</p><p id='section2'>This is a second block of content</p>";
         $secondPage->save();
 
 
         $secondPage->html = "<p id='section1'>Hello, This is a test</p><p id='section2'>This is a second block of content</p>";
         $secondPage->save();
 

-        $this->asAdmin()->visit($page->getUrl())
-            ->dontSee('Hello, This is a test');
+        $this->asEditor();
+
+        $pageContent = $this->get($page->getUrl());
+        $pageContent->assertDontSee('Hello, This is a test');

 
         $originalHtml = $page->html;
         $page->html .= "{{@{$secondPage->id}}}";
         $page->save();
 
 
         $originalHtml = $page->html;
         $page->html .= "{{@{$secondPage->id}}}";
         $page->save();
 

-        $this->asAdmin()->visit($page->getUrl())
-            ->see('Hello, This is a test')
-            ->see('This is a second block of content');
+        $pageContent = $this->get($page->getUrl());
+        $pageContent->assertSee('Hello, This is a test');
+        $pageContent->assertSee('This is a second block of content');

 
         $page->html = $originalHtml . " Well {{@{$secondPage->id}#section2}}";
         $page->save();
 
 
         $page->html = $originalHtml . " Well {{@{$secondPage->id}#section2}}";
         $page->save();
 

-        $this->asAdmin()->visit($page->getUrl())
-            ->dontSee('Hello, This is a test')
-            ->see('Well This is a second block of content');
+        $pageContent = $this->get($page->getUrl());
+        $pageContent->assertDontSee('Hello, This is a test');
+        $pageContent->assertSee('Well This is a second block of content');
+    }
+
+    public function test_page_revision_views_viewable()
+    {
+        $this->asEditor();
+
+        $entityRepo = $this->app[EntityRepo::class];
+        $page = Page::first();
+        $entityRepo->updatePage($page, $page->book_id, ['name' => 'updated page', 'html' => '<p>new content</p>', 'summary' => 'page revision testing']);
+        $pageRevision = $page->revisions->last();
+
+        $revisionView = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id);
+        $revisionView->assertStatus(200);
+        $revisionView->assertSee('new content');
+
+        $revisionView = $this->get($page->getUrl() . '/revisions/' . $pageRevision->id . '/changes');
+        $revisionView->assertStatus(200);
+        $revisionView->assertSee('new content');

     }
 
 }
     }
 
 }

diff --git a/tests/PublicActionTest.php b/tests/PublicActionTest.php
index 62a321b5e18dbd563e85f53977475e514067338e..6f8590d4b7b19f8a52d76381f2438527ac0e4b32 100644 (file)
--- a/tests/PublicActionTest.php
+++ b/tests/PublicActionTest.php
@@ -84,7 +84,7 @@ class PublicActionTest extends BrowserKitTest
     {
         $page = \BookStack\Page::first();
         $this->asAdmin()->visit($page->getUrl());
     {
         $page = \BookStack\Page::first();
         $this->asAdmin()->visit($page->getUrl());

-        Auth::logout();
+        \Auth::logout();

         view()->share('pageTitle', '');
         $this->forceVisit('/cats/dogs/hippos');
         $this->dontSee($page->name);
         view()->share('pageTitle', '');
         $this->forceVisit('/cats/dogs/hippos');
         $this->dontSee($page->name);

diff --git a/tests/TestCase.php b/tests/TestCase.php
index d64aef3dba8d320cfc9ef25f548539797578a26c..f3f36ca1cc75daa3211c82d0ee5eec2628891b33 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -13,6 +13,7 @@ abstract class TestCase extends BaseTestCase
     use DatabaseTransactions;
 
     protected $admin;
     use DatabaseTransactions;
 
     protected $admin;

+    protected $editor;

 
     /**
      * Set the current user context to be an admin.
 
     /**
      * Set the current user context to be an admin.


@@ -35,6 +36,28 @@ abstract class TestCase extends BaseTestCase
         return $this->admin;
     }
 
         return $this->admin;
     }
 

+    /**
+     * Set the current user context to be an editor.
+     * @return $this
+     */
+    public function asEditor()
+    {
+        return $this->actingAs($this->getEditor());
+    }
+
+
+    /**
+     * Get a editor user.
+     * @return mixed
+     */
+    public function getEditor() {
+        if($this->editor === null) {
+            $editorRole = Role::getRole('editor');
+            $this->editor = $editorRole->users->first();
+        }
+        return $this->editor;
+    }
+

     /**
      * Create and return a new book.
      * @param array $input
     /**
      * Create and return a new book.
      * @param array $input