From 2d4034f3b7a0828a47859f0fc313dfb0b506e622 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 21 Jan 2017 16:16:27 +0000
Subject: [PATCH] Added transclusion tests and fixed other tests
---
app/Services/PermissionService.php | 5 +-
tests/Entity/PageContentTest.php | 33 +++++++++++++
tests/Entity/{TagTests.php => TagTest.php} | 55 ++--------------------
tests/TestCase.php | 2 +-
4 files changed, 42 insertions(+), 53 deletions(-)
create mode 100644 tests/Entity/PageContentTest.php
rename tests/Entity/{TagTests.php => TagTest.php} (59%)
diff --git a/app/Services/PermissionService.php b/app/Services/PermissionService.php
index 6363541ef..65fe0f33e 100644
--- a/app/Services/PermissionService.php
+++ b/app/Services/PermissionService.php
@@ -157,7 +157,7 @@ class PermissionService
*/
public function buildJointPermissionsForEntity(Entity $entity)
{
- $roles = $this->role->with('jointPermissions')->get();
+ $roles = $this->role->get();
$entities = collect([$entity]);
if ($entity->isA('book')) {
@@ -177,7 +177,7 @@ class PermissionService
*/
public function buildJointPermissionsForEntities(Collection $entities)
{
- $roles = $this->role->with('jointPermissions')->get();
+ $roles = $this->role->get();
$this->deleteManyJointPermissionsForEntities($entities);
$this->createManyJointPermissions($entities, $roles);
}
@@ -564,6 +564,7 @@ class PermissionService
});
});
});
+ $this->clean();
return $q;
}
diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
new file mode 100644
index 000000000..deeacb593
--- /dev/null
+++ b/tests/Entity/PageContentTest.php
@@ -0,0 +1,33 @@
+<?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');
+ }
+
+}
diff --git a/tests/Entity/TagTests.php b/tests/Entity/TagTest.php
similarity index 59%
rename from tests/Entity/TagTests.php
rename to tests/Entity/TagTest.php
index 0520e1a00..2d42ffa4b 100644
--- a/tests/Entity/TagTests.php
+++ b/tests/Entity/TagTest.php
@@ -4,7 +4,7 @@ use BookStack\Tag;
use BookStack\Page;
use BookStack\Services\PermissionService;
-class TagTests extends \TestCase
+class TagTest extends \TestCase
{
protected $defaultTagCount = 20;
@@ -86,61 +86,16 @@ class TagTests extends \TestCase
$attrs = $attrs->merge(factory(Tag::class, 5)->make(['name' => 'color']));
$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
$page->restricted = true;
$page->save();
$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([]);
}
}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d3620eae0..4f3df4b90 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -60,7 +60,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
*/
public function asEditor()
{
- if($this->editor === null) {
+ if ($this->editor === null) {
$this->editor = $this->getEditor();
}
return $this->actingAs($this->editor);