webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Includes: Added block-level handling to new include system

Browse Source 
Implements block promoting to body (including position choosing based
upon likely tag position within parent) and block splitting where we're
only a single depth down from the body child.
This commit is contained in:
Dan Brown
2023-11-24 23:39:16 +00:00
parent 75936454cc
commit c88eb729a4
3 changed files with 172 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
tests/Unit/PageIncludeParserTest.php
View File

@@ -7,7 +7,7 @@ use Tests\TestCase;
class PageIncludeParserTest extends TestCase
{
public function test_include_simple_inline_text()
public function test_simple_inline_text()
{
$this->runParserTest(
'<p>{{@45#content}}</p>',
@@ -16,7 +16,7 @@ class PageIncludeParserTest extends TestCase
);
}
public function test_include_simple_inline_text_with_existing_siblings()
public function test_simple_inline_text_with_existing_siblings()
{
$this->runParserTest(
'<p>{{@45#content}} <strong>Hi</strong>there!</p>',
@@ -25,7 +25,7 @@ class PageIncludeParserTest extends TestCase
);
}
public function test_include_simple_inline_text_within_other_text()
public function test_simple_inline_text_within_other_text()
{
$this->runParserTest(
'<p>Hello {{@45#content}}there!</p>',
@@ -34,6 +34,96 @@ class PageIncludeParserTest extends TestCase
);
}
public function test_block_content_types()
{
$inputs = [
'<table id="content"><td>Text</td></table>',
'<ul id="content"><li>Item A</li></ul>',
'<ol id="content"><li>Item A</li></ol>',
'<pre id="content">Code</pre>',
];
foreach ($inputs as $input) {
$this->runParserTest(
'<p>A{{@45#content}}B</p>',
['45' => $input],
'<p>A</p>' . $input . '<p>B</p>',
);
}
}
public function test_block_content_nested_origin_gets_placed_before()
{
$this->runParserTest(
'<p><strong>A {{@45#content}} there!</strong></p>',
['45' => '<pre id="content">Testing</pre>'],
'<pre id="content">Testing</pre><p><strong>A there!</strong></p>',
);
}
public function test_block_content_nested_origin_gets_placed_after()
{
$this->runParserTest(
'<p><strong>Some really good {{@45#content}} there!</strong></p>',
['45' => '<pre id="content">Testing</pre>'],
'<p><strong>Some really good there!</strong></p><pre id="content">Testing</pre>',
);
}
public function test_block_content_in_shallow_origin_gets_split()
{
$this->runParserTest(
'<p>Some really good {{@45#content}} there!</p>',
['45' => '<pre id="content">doggos</pre>'],
'<p>Some really good </p><pre id="content">doggos</pre><p> there!</p>',
);
}
public function test_block_content_in_shallow_origin_split_does_not_duplicate_id()
{
$this->runParserTest(
'<p id="test" title="Hi">Some really good {{@45#content}} there!</p>',
['45' => '<pre id="content">doggos</pre>'],
'<p title="Hi">Some really good </p><pre id="content">doggos</pre><p id="test" title="Hi"> there!</p>',
);
}
public function test_block_content_in_shallow_origin_does_not_leave_empty_nodes()
{
$this->runParserTest(
'<p>{{@45#content}}</p>',
['45' => '<pre id="content">doggos</pre>'],
'<pre id="content">doggos</pre>',
);
}
public function test_simple_whole_document()
{
$this->runParserTest(
'<p>{{@45}}</p>',
['45' => '<p id="content">Testing</p>'],
'<p id="content">Testing</p>',
);
}
public function test_multi_source_elem_whole_document()
{
$this->runParserTest(
'<p>{{@45}}</p>',
['45' => '<p>Testing</p><blockquote>This</blockquote>'],
'<p>Testing</p><blockquote>This</blockquote>',
);
}
public function test_multi_source_elem_whole_document_with_shared_content_origin()
{
$this->runParserTest(
'<p>This is {{@45}} some text</p>',
['45' => '<p>Testing</p><blockquote>This</blockquote>'],
'<p>This is </p><p>Testing</p><blockquote>This</blockquote><p> some text</p>',
);
}
protected function runParserTest(string $html, array $contentById, string $expected)
{
$parser = new PageIncludeParser($html, function (int $id) use ($contentById) {