X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/2431ce9f86cdbba5bbd7b179e3ab4cd66b6a1b77..refs/pull/696/head:/tests/Entity/PageContentTest.php

diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index 3a005bc67..370514788 100644
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -1,33 +1,115 @@
-<?php
+<?php namespace Tests;
 
-class PageContentTest extends BrowserKitTest
+use BookStack\Page;
+use BookStack\Repos\EntityRepo;
+
+class PageContentTest extends TestCase
 {
 
     public function test_page_includes()
     {
-        $page = \BookStack\Page::first();
-        $secondPage = \BookStack\Page::all()->get(2);
+        $page = Page::first();
+        $secondPage = Page::where('id', '!=', $page->id)->first();
 
         $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();
 
-        $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();
 
-        $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_saving_page_with_includes()
+    {
+        $page = Page::first();
+        $secondPage = Page::where('id', '!=', $page->id)->first();
+        $this->asEditor();
+        $page->html = "<p>{{@$secondPage->id}}</p>";
+
+        $resp = $this->put($page->getUrl(), ['name' => $page->name, 'html' => $page->html, 'summary' => '']);
+
+        $resp->assertStatus(302);
+
+        $page = Page::find($page->id);
+        $this->assertContains("{{@$secondPage->id}}", $page->html);
+    }
+
+    public function test_page_includes_do_not_break_tables()
+    {
+        $page = Page::first();
+        $secondPage = Page::where('id', '!=', $page->id)->first();
+
+        $content = '<table id="table"><tbody><tr><td>test</td></tr></tbody></table>';
+        $secondPage->html = $content;
+        $secondPage->save();
+
+        $page->html = "{{@{$secondPage->id}#table}}";
+        $page->save();
+
+        $this->asEditor();
+        $pageResp = $this->get($page->getUrl());
+        $pageResp->assertSee($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');
+    }
+
+    public function test_page_revision_restore_updates_content()
+    {
+        $this->asEditor();
+
+        $entityRepo = $this->app[EntityRepo::class];
+        $page = Page::first();
+        $entityRepo->updatePage($page, $page->book_id, ['name' => 'updated page abc123', 'html' => '<p>new contente def456</p>', 'summary' => 'initial page revision testing']);
+        $entityRepo->updatePage($page, $page->book_id, ['name' => 'updated page again', 'html' => '<p>new content</p>', 'summary' => 'page revision testing']);
+        $page =  Page::find($page->id);
+
+
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertDontSee('abc123');
+        $pageView->assertDontSee('def456');
+
+        $revToRestore = $page->revisions()->where('name', 'like', '%abc123')->first();
+        $restoreReq = $this->get($page->getUrl() . '/revisions/' . $revToRestore->id . '/restore');
+        $page =  Page::find($page->id);
+
+        $restoreReq->assertStatus(302);
+        $restoreReq->assertRedirect($page->getUrl());
+
+        $pageView = $this->get($page->getUrl());
+        $pageView->assertSee('abc123');
+        $pageView->assertSee('def456');
     }
 
 }