Added transclusion tests and fixed other tests

@@ -157,7 +157,7 @@ class PermissionService
      */
      */
     public function buildJointPermissionsForEntity(Entity $entity)
     public function buildJointPermissionsForEntity(Entity $entity)
     {
     {
-        $roles = $this->role->with('jointPermissions')->get();
+        $roles = $this->role->get();
         $entities = collect([$entity]);
         $entities = collect([$entity]);
 
 
         if ($entity->isA('book')) {
         if ($entity->isA('book')) {
@@ -177,7 +177,7 @@ class PermissionService
      */
      */
     public function buildJointPermissionsForEntities(Collection $entities)
     public function buildJointPermissionsForEntities(Collection $entities)
     {
     {
-        $roles = $this->role->with('jointPermissions')->get();
+        $roles = $this->role->get();
         $this->deleteManyJointPermissionsForEntities($entities);
         $this->deleteManyJointPermissionsForEntities($entities);
         $this->createManyJointPermissions($entities, $roles);
         $this->createManyJointPermissions($entities, $roles);
     }
     }
@@ -564,6 +564,7 @@ class PermissionService
                     });
                     });
             });
             });
         });
         });
+        $this->clean();
         return $q;
         return $q;
     }
     }
 
 

+<?php
+
+class PageContentTest extends TestCase
+{
+
+    public function test_page_includes()
+    {
+        $page = \BookStack\Page::first();
+        $secondPage = \BookStack\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();
+
+        $this->asAdmin()->visit($page->getUrl())
+            ->dontSee('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');
+
+        $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');
+    }
+
+}

@@ -4,7 +4,7 @@ use BookStack\Tag;
 use BookStack\Page;
 use BookStack\Page;
 use BookStack\Services\PermissionService;
 use BookStack\Services\PermissionService;
 
 
-class TagTests extends \TestCase
+class TagTest extends \TestCase
 {
 {
 
 
     protected $defaultTagCount = 20;
     protected $defaultTagCount = 20;
@@ -86,61 +86,16 @@ class TagTests extends \TestCase
         $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color']));
         $attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color']));
         $page = $this->getPageWithTags($attrs);
         $page = $this->getPageWithTags($attrs);
 
 
-        $this->asAdmin()->get('/ajax/tags/suggest?search=co')->seeJsonEquals(['color', 'country']);
-        $this->asEditor()->get('/ajax/tags/suggest?search=co')->seeJsonEquals(['color', 'country']);
+        $this->asAdmin()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country']);
+        $this->asEditor()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country']);
 
 
         // Set restricted permission the page
         // Set restricted permission the page
         $page->restricted = true;
         $page->restricted = true;
         $page->save();
         $page->save();
         $permissionService->buildJointPermissionsForEntity($page);
         $permissionService->buildJointPermissionsForEntity($page);
 
 
-        $this->asAdmin()->get('/ajax/tags/suggest?search=co')->seeJsonEquals(['color', 'country']);
-        $this->asEditor()->get('/ajax/tags/suggest?search=co')->seeJsonEquals([]);
-    }
-
-    public function test_entity_tag_updating()
-    {
-        $page = $this->getPageWithTags();
-
-        $testJsonData = [
-            ['name' => 'color', 'value' => 'red'],
-            ['name' => 'color', 'value' => ' blue '],
-            ['name' => 'city', 'value' => 'London '],
-            ['name' => 'country', 'value' => ' England'],
-        ];
-        $testResponseJsonData = [
-            ['name' => 'color', 'value' => 'red'],
-            ['name' => 'color', 'value' => 'blue'],
-            ['name' => 'city', 'value' => 'London'],
-            ['name' => 'country', 'value' => 'England'],
-        ];
-
-        // Do update request
-        $this->asAdmin()->json("POST", "/ajax/tags/update/page/" . $page->id, ['tags' => $testJsonData]);
-        $updateData = json_decode($this->response->getContent());
-        // Check data is correct
-        $testDataCorrect = true;
-        foreach ($updateData->tags as $data) {
-            $testItem = ['name' => $data->name, 'value' => $data->value];
-            if (!in_array($testItem, $testResponseJsonData)) $testDataCorrect = false;
-        }
-        $testMessage = "Expected data was not found in the response.\nExpected Data: %s\nRecieved Data: %s";
-        $this->assertTrue($testDataCorrect, sprintf($testMessage, json_encode($testResponseJsonData), json_encode($updateData)));
-        $this->assertTrue(isset($updateData->message), "No message returned in tag update response");
-
-        // Do get request
-        $this->asAdmin()->get("/ajax/tags/get/page/" . $page->id);
-        $getResponseData = json_decode($this->response->getContent());
-        // Check counts
-        $this->assertTrue(count($getResponseData) === count($testJsonData), "The received tag count is incorrect");
-        // Check data is correct
-        $testDataCorrect = true;
-        foreach ($getResponseData as $data) {
-            $testItem = ['name' => $data->name, 'value' => $data->value];
-            if (!in_array($testItem, $testResponseJsonData)) $testDataCorrect = false;
-        }
-        $testMessage = "Expected data was not found in the response.\nExpected Data: %s\nRecieved Data: %s";
-        $this->assertTrue($testDataCorrect, sprintf($testMessage, json_encode($testResponseJsonData), json_encode($getResponseData)));
+        $this->asAdmin()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals(['color', 'country']);
+        $this->asEditor()->get('/ajax/tags/suggest/names?search=co')->seeJsonEquals([]);
     }
     }
 
 
 }
 }

@@ -60,7 +60,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
      */
      */
     public function asEditor()
     public function asEditor()
     {
     {
-        if($this->editor === null) {
+        if ($this->editor === null) {
             $this->editor = $this->getEditor();
             $this->editor = $this->getEditor();
         }
         }
         return $this->actingAs($this->editor);
         return $this->actingAs($this->editor);