Updated Spanish translation

[bookstack] / tests / Permissions / RolesTest.php

diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php
index f131ed8857927263173cdddcf0b42546b427d06b..5bc66986baee15f2d8155970193f79f1592919cc 100644 (file)
--- a/tests/Permissions/RolesTest.php
+++ b/tests/Permissions/RolesTest.php
@@ -214,12 +214,12 @@ class RolesTest extends BrowserKitTest
     public function test_books_create_all_permissions()
     {
         $this->checkAccessPermission('book-create-all', [
     public function test_books_create_all_permissions()
     {
         $this->checkAccessPermission('book-create-all', [

-            '/books/create'
+            '/create-book'

         ], [
             '/books' => 'Create New Book'
         ]);
 
         ], [
             '/books' => 'Create New Book'
         ]);
 

-        $this->visit('/books/create')
+        $this->visit('/create-book')

             ->type('test book', 'name')
             ->type('book desc', 'description')
             ->press('Save Book')
             ->type('test book', 'name')
             ->type('book desc', 'description')
             ->press('Save Book')


@@ -293,40 +293,38 @@ class RolesTest extends BrowserKitTest
     {
         $book = \BookStack\Book::take(1)->get()->first();
         $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];
     {
         $book = \BookStack\Book::take(1)->get()->first();
         $ownBook = $this->createEntityChainBelongingToUser($this->user)['book'];

-        $baseUrl = $ownBook->getUrl() . '/chapter';

         $this->checkAccessPermission('chapter-create-own', [
         $this->checkAccessPermission('chapter-create-own', [

-            $baseUrl . '/create'
+            $ownBook->getUrl('/create-chapter')

         ], [
             $ownBook->getUrl() => 'New Chapter'
         ]);
 
         ], [
             $ownBook->getUrl() => 'New Chapter'
         ]);
 

-        $this->visit($baseUrl . '/create')
+        $this->visit($ownBook->getUrl('/create-chapter'))

             ->type('test chapter', 'name')
             ->type('chapter desc', 'description')
             ->press('Save Chapter')
             ->type('test chapter', 'name')
             ->type('chapter desc', 'description')
             ->press('Save Chapter')

-            ->seePageIs($baseUrl . '/test-chapter');
+            ->seePageIs($ownBook->getUrl('/chapter/test-chapter'));

 
         $this->visit($book->getUrl())
             ->dontSeeInElement('.action-buttons', 'New Chapter')
 
         $this->visit($book->getUrl())
             ->dontSeeInElement('.action-buttons', 'New Chapter')

-            ->visit($book->getUrl() . '/chapter/create')
+            ->visit($book->getUrl('/create-chapter'))

             ->seePageIs('/');
     }
 
     public function test_chapter_create_all_permissions()
     {
         $book = \BookStack\Book::take(1)->get()->first();
             ->seePageIs('/');
     }
 
     public function test_chapter_create_all_permissions()
     {
         $book = \BookStack\Book::take(1)->get()->first();

-        $baseUrl = $book->getUrl() . '/chapter';

         $this->checkAccessPermission('chapter-create-all', [
         $this->checkAccessPermission('chapter-create-all', [

-            $baseUrl . '/create'
+            $book->getUrl('/create-chapter')

         ], [
             $book->getUrl() => 'New Chapter'
         ]);
 
         ], [
             $book->getUrl() => 'New Chapter'
         ]);
 

-        $this->visit($baseUrl . '/create')
+        $this->visit($book->getUrl('/create-chapter'))

             ->type('test chapter', 'name')
             ->type('chapter desc', 'description')
             ->press('Save Chapter')
             ->type('test chapter', 'name')
             ->type('chapter desc', 'description')
             ->press('Save Chapter')

-            ->seePageIs($baseUrl . '/test-chapter');
+            ->seePageIs($book->getUrl('/chapter/test-chapter'));

     }
 
     public function test_chapter_edit_own_permission()
     }
 
     public function test_chapter_edit_own_permission()


@@ -403,10 +401,8 @@ class RolesTest extends BrowserKitTest
         $ownBook = $entities['book'];
         $ownChapter = $entities['chapter'];
 
         $ownBook = $entities['book'];
         $ownChapter = $entities['chapter'];
 

-        $baseUrl = $ownBook->getUrl() . '/page';
-
-        $createUrl = $baseUrl . '/create';
-        $createUrlChapter = $ownChapter->getUrl() . '/create-page';
+        $createUrl = $ownBook->getUrl('/create-page');
+        $createUrlChapter = $ownChapter->getUrl('/create-page');

         $accessUrls = [$createUrl, $createUrlChapter];
 
         foreach ($accessUrls as $url) {
         $accessUrls = [$createUrl, $createUrlChapter];
 
         foreach ($accessUrls as $url) {


@@ -427,15 +423,15 @@ class RolesTest extends BrowserKitTest
             $this->seePageIs($expectedUrl);
         }
 
             $this->seePageIs($expectedUrl);
         }
 

-        $this->visit($baseUrl . '/create')
+        $this->visit($createUrl)

             ->type('test page', 'name')
             ->type('page desc', 'html')
             ->press('Save Page')
             ->type('test page', 'name')
             ->type('page desc', 'html')
             ->press('Save Page')

-            ->seePageIs($baseUrl . '/test-page');
+            ->seePageIs($ownBook->getUrl('/page/test-page'));

 
         $this->visit($book->getUrl())
             ->dontSeeInElement('.action-buttons', 'New Page')
 
         $this->visit($book->getUrl())
             ->dontSeeInElement('.action-buttons', 'New Page')

-            ->visit($book->getUrl() . '/page/create')
+            ->visit($book->getUrl() . '/create-page')

             ->seePageIs('/');
         $this->visit($chapter->getUrl())
             ->dontSeeInElement('.action-buttons', 'New Page')
             ->seePageIs('/');
         $this->visit($chapter->getUrl())
             ->dontSeeInElement('.action-buttons', 'New Page')


@@ -448,9 +444,9 @@ class RolesTest extends BrowserKitTest
         $book = \BookStack\Book::take(1)->get()->first();
         $chapter = \BookStack\Chapter::take(1)->get()->first();
         $baseUrl = $book->getUrl() . '/page';
         $book = \BookStack\Book::take(1)->get()->first();
         $chapter = \BookStack\Chapter::take(1)->get()->first();
         $baseUrl = $book->getUrl() . '/page';

-        $createUrl = $baseUrl . '/create';
+        $createUrl = $book->getUrl('/create-page');

 
 

-        $createUrlChapter = $chapter->getUrl() . '/create-page';
+        $createUrlChapter = $chapter->getUrl('/create-page');

         $accessUrls = [$createUrl, $createUrlChapter];
 
         foreach ($accessUrls as $url) {
         $accessUrls = [$createUrl, $createUrlChapter];
 
         foreach ($accessUrls as $url) {


@@ -471,17 +467,17 @@ class RolesTest extends BrowserKitTest
             $this->seePageIs($expectedUrl);
         }
 
             $this->seePageIs($expectedUrl);
         }
 

-        $this->visit($baseUrl . '/create')
+        $this->visit($createUrl)

             ->type('test page', 'name')
             ->type('page desc', 'html')
             ->press('Save Page')
             ->type('test page', 'name')
             ->type('page desc', 'html')
             ->press('Save Page')

-            ->seePageIs($baseUrl . '/test-page');
+            ->seePageIs($book->getUrl('/page/test-page'));

 
 

-        $this->visit($chapter->getUrl() . '/create-page')
+        $this->visit($chapter->getUrl('/create-page'))

             ->type('new test page', 'name')
             ->type('page desc', 'html')
             ->press('Save Page')
             ->type('new test page', 'name')
             ->type('page desc', 'html')
             ->press('Save Page')

-            ->seePageIs($baseUrl . '/new-test-page');
+            ->seePageIs($book->getUrl('/page/new-test-page'));

     }
 
     public function test_page_edit_own_permission()
     }
 
     public function test_page_edit_own_permission()


@@ -627,7 +623,7 @@ class RolesTest extends BrowserKitTest
         $page = Page::first();
         $viewerRole = \BookStack\Role::getRole('viewer');
         $viewer = $this->getViewer();
         $page = Page::first();
         $viewerRole = \BookStack\Role::getRole('viewer');
         $viewer = $this->getViewer();

-        $this->actingAs($viewer)->visit($page->getUrl())->assertResponseOk();
+        $this->actingAs($viewer)->visit($page->getUrl())->assertResponseStatus(200);

 
         $this->asAdmin()->put('/settings/roles/' . $viewerRole->id, [
             'display_name' => $viewerRole->display_name,
 
         $this->asAdmin()->put('/settings/roles/' . $viewerRole->id, [
             'display_name' => $viewerRole->display_name,


@@ -667,97 +663,94 @@ class RolesTest extends BrowserKitTest
         $this->giveUserPermissions($this->user, ['comment-create-all']);
 
         $this->actingAs($this->user)->addComment($ownPage);
         $this->giveUserPermissions($this->user, ['comment-create-all']);
 
         $this->actingAs($this->user)->addComment($ownPage);

-        $this->assertResponseOk(200)->seeJsonContains(['status' => 'success']);
+        $this->assertResponseStatus(200);

     }
 
 
     public function test_comment_update_own_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
         $this->giveUserPermissions($this->user, ['comment-create-all']);
     }
 
 
     public function test_comment_update_own_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
         $this->giveUserPermissions($this->user, ['comment-create-all']);

-        $comment = $this->actingAs($this->user)->addComment($ownPage);
+        $commentId = $this->actingAs($this->user)->addComment($ownPage);

 
         // no comment-update-own
 
         // no comment-update-own

-        $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
+        $this->actingAs($this->user)->updateComment($commentId);

         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-update-own']);
 
         // now has comment-update-own
         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-update-own']);
 
         // now has comment-update-own

-        $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
-        $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+        $this->actingAs($this->user)->updateComment($commentId);
+        $this->assertResponseStatus(200);

     }
 
     public function test_comment_update_all_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
     }
 
     public function test_comment_update_all_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];

-        $comment = $this->asAdmin()->addComment($ownPage);
+        $commentId = $this->asAdmin()->addComment($ownPage);

 
         // no comment-update-all
 
         // no comment-update-all

-        $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
+        $this->actingAs($this->user)->updateComment($commentId);

         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-update-all']);
 
         // now has comment-update-all
         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-update-all']);
 
         // now has comment-update-all

-        $this->actingAs($this->user)->updateComment($ownPage, $comment['id']);
-        $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+        $this->actingAs($this->user)->updateComment($commentId);
+        $this->assertResponseStatus(200);

     }
 
     public function test_comment_delete_own_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
         $this->giveUserPermissions($this->user, ['comment-create-all']);
     }
 
     public function test_comment_delete_own_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
         $this->giveUserPermissions($this->user, ['comment-create-all']);

-        $comment = $this->actingAs($this->user)->addComment($ownPage);
+        $commentId = $this->actingAs($this->user)->addComment($ownPage);

 
         // no comment-delete-own
 
         // no comment-delete-own

-        $this->actingAs($this->user)->deleteComment($comment['id']);
+        $this->actingAs($this->user)->deleteComment($commentId);

         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-delete-own']);
 
         // now has comment-update-own
         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-delete-own']);
 
         // now has comment-update-own

-        $this->actingAs($this->user)->deleteComment($comment['id']);
-        $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+        $this->actingAs($this->user)->deleteComment($commentId);
+        $this->assertResponseStatus(200);

     }
 
     public function test_comment_delete_all_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];
     }
 
     public function test_comment_delete_all_permission () {
         $ownPage = $this->createEntityChainBelongingToUser($this->user)['page'];

-        $comment = $this->asAdmin()->addComment($ownPage);
+        $commentId = $this->asAdmin()->addComment($ownPage);

 
         // no comment-delete-all
 
         // no comment-delete-all

-        $this->actingAs($this->user)->deleteComment($comment['id']);
+        $this->actingAs($this->user)->deleteComment($commentId);

         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-delete-all']);
 
         // now has comment-delete-all
         $this->assertResponseStatus(403);
 
         $this->giveUserPermissions($this->user, ['comment-delete-all']);
 
         // now has comment-delete-all

-        $this->actingAs($this->user)->deleteComment($comment['id']);
-        $this->assertResponseOk()->seeJsonContains(['status' => 'success']);
+        $this->actingAs($this->user)->deleteComment($commentId);
+        $this->assertResponseStatus(200);

     }
 
     private function addComment($page) {
         $comment = factory(\BookStack\Comment::class)->make();
     }
 
     private function addComment($page) {
         $comment = factory(\BookStack\Comment::class)->make();

-        $url = "/ajax/page/$page->id/comment/";
+        $url = "/ajax/page/$page->id/comment";

         $request = [
             'text' => $comment->text,
             'html' => $comment->html
         ];
 
         $request = [
             'text' => $comment->text,
             'html' => $comment->html
         ];
 

-        $this->json('POST', $url, $request);
-        $resp = $this->decodeResponseJson();
-        if (isset($resp['comment'])) {
-            return $resp['comment'];
-        }
-        return null;
+        $this->postJson($url, $request);
+        $comment = $page->comments()->first();
+        return $comment === null ? null : $comment->id;

     }
 
     }
 

-    private function updateComment($page, $commentId) {
+    private function updateComment($commentId) {

         $comment = factory(\BookStack\Comment::class)->make();
         $comment = factory(\BookStack\Comment::class)->make();

-        $url = "/ajax/page/$page->id/comment/$commentId";
+        $url = "/ajax/comment/$commentId";

         $request = [
             'text' => $comment->text,
             'html' => $comment->html
         ];
 
         $request = [
             'text' => $comment->text,
             'html' => $comment->html
         ];
 

-        return $this->json('PUT', $url, $request);
+        return $this->putJson($url, $request);

     }
 
     private function deleteComment($commentId) {
     }
 
     private function deleteComment($commentId) {