github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-30 20:51:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated some comment elements and standardised more JS

Browse Source 
- Updated comment routes to be simpler.
- Updated comments JS to align better with updated component system.
- Documented available global JS functions/services.
- Removed redundant controller method.
- Added window.$events helpers for validation messages and
success/error.
- Updated JS events system to not be class based for simplicity.
- Added window.trans_plural method to handle pluralisation/replacements
where you already have the translation string itself.

Fixes #1836
This commit is contained in:
Dan Brown
2020-07-28 18:19:18 +01:00
parent 2c0fdf83c1
commit 7590ecd37c
11 changed files with 192 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/Entity/CommentTest.php
View File

@ -13,7 +13,7 @@ class CommentTest extends TestCase
$page = Page::first();
$comment = factory(Comment::class)->make(['parent_id' => 2]);
$resp = $this->postJson("/ajax/page/$page->id/comment", $comment->getAttributes());
$resp = $this->postJson("/comment/$page->id", $comment->getAttributes());
$resp->assertStatus(200);
$resp->assertSee($comment->text);
@ -36,11 +36,11 @@ class CommentTest extends TestCase
$page = Page::first();
$comment = factory(Comment::class)->make();
$this->postJson("/ajax/page/$page->id/comment", $comment->getAttributes());
$this->postJson("/comment/$page->id", $comment->getAttributes());
$comment = $page->comments()->first();
$newText = 'updated text content';
$resp = $this->putJson("/ajax/comment/$comment->id", [
$resp = $this->putJson("/comment/$comment->id", [
'text' => $newText,
]);
@ -60,11 +60,11 @@ class CommentTest extends TestCase
$page = Page::first();
$comment = factory(Comment::class)->make();
$this->postJson("/ajax/page/$page->id/comment", $comment->getAttributes());
$this->postJson("/comment/$page->id", $comment->getAttributes());
$comment = $page->comments()->first();
$resp = $this->delete("/ajax/comment/$comment->id");
$resp = $this->delete("/comment/$comment->id");
$resp->assertStatus(200);
$this->assertDatabaseMissing('comments', [
@ -75,7 +75,7 @@ class CommentTest extends TestCase
public function test_comments_converts_markdown_input_to_html()
{
$page = Page::first();
$this->asAdmin()->postJson("/ajax/page/$page->id/comment", [
$this->asAdmin()->postJson("/comment/$page->id", [
'text' => '# My Title',
]);
@ -96,7 +96,7 @@ class CommentTest extends TestCase
$page = Page::first();
$script = '<script>const a = "script";</script>\n\n# sometextinthecomment';
$this->postJson("/ajax/page/$page->id/comment", [
$this->postJson("/comment/$page->id", [
'text' => $script,
]);
@ -105,7 +105,7 @@ class CommentTest extends TestCase
$pageView->assertSee('sometextinthecomment');
$comment = $page->comments()->first();
$this->putJson("/ajax/comment/$comment->id", [
$this->putJson("/comment/$comment->id", [
'text' => $script . 'updated',
]);