LDAP: Added TLS support

[bookstack] / tests / Permissions / RestrictionsTest.php

diff --git a/tests/Permissions/RestrictionsTest.php b/tests/Permissions/RestrictionsTest.php
index a7f681a37d1597d72a254d4e7b549e8c2e310202..a43a65e5865c16744eddf636fa208ccce054176f 100644 (file)
--- a/tests/Permissions/RestrictionsTest.php
+++ b/tests/Permissions/RestrictionsTest.php
@@ -1,18 +1,18 @@
-<?php namespace Tests;
+<?php namespace Tests\Permissions;

 
 use BookStack\Entities\Book;
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Chapter;
 use BookStack\Entities\Entity;
 use BookStack\Auth\User;
 
 use BookStack\Entities\Book;
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Chapter;
 use BookStack\Entities\Entity;
 use BookStack\Auth\User;

-use BookStack\Entities\Repos\EntityRepo;

 use BookStack\Entities\Page;
 use BookStack\Entities\Page;

+use Tests\BrowserKitTest;

 
 class RestrictionsTest extends BrowserKitTest
 {
 
     /**
 
 class RestrictionsTest extends BrowserKitTest
 {
 
     /**

-     * @var \BookStack\Auth\User
+     * @var User

      */
     protected $user;
 
      */
     protected $user;
 


@@ -21,7 +21,7 @@ class RestrictionsTest extends BrowserKitTest
      */
     protected $viewer;
 
      */
     protected $viewer;
 

-    public function setUp()
+    public function setUp(): void

     {
         parent::setUp();
         $this->user = $this->getEditor();
     {
         parent::setUp();
         $this->user = $this->getEditor();


@@ -58,7 +58,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_bookshelf_update_restriction()
     {
 
     public function test_bookshelf_update_restriction()
     {

-        $shelf = BookShelf::first();
+        $shelf = Bookshelf::first();

 
         $this->actingAs($this->user)
             ->visit($shelf->getUrl('/edit'))
 
         $this->actingAs($this->user)
             ->visit($shelf->getUrl('/edit'))


@@ -327,7 +327,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_page_view_restriction()
     {
 
     public function test_page_view_restriction()
     {

-        $page = \BookStack\Entities\Page::first();
+        $page = Page::first();

 
         $pageUrl = $page->getUrl();
         $this->actingAs($this->user)
 
         $pageUrl = $page->getUrl();
         $this->actingAs($this->user)


@@ -367,7 +367,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_page_delete_restriction()
     {
 
     public function test_page_delete_restriction()
     {

-        $page = \BookStack\Entities\Page::first();
+        $page = Page::first();

 
         $pageUrl = $page->getUrl();
         $this->actingAs($this->user)
 
         $pageUrl = $page->getUrl();
         $this->actingAs($this->user)


@@ -438,7 +438,7 @@ class RestrictionsTest extends BrowserKitTest
 
     public function test_page_restriction_form()
     {
 
     public function test_page_restriction_form()
     {

-        $page = \BookStack\Entities\Page::first();
+        $page = Page::first();

         $this->asAdmin()->visit($page->getUrl() . '/permissions')
             ->see('Page Permissions')
             ->check('restricted')
         $this->asAdmin()->visit($page->getUrl() . '/permissions')
             ->see('Page Permissions')
             ->check('restricted')


@@ -665,10 +665,8 @@ class RestrictionsTest extends BrowserKitTest
         $this->setEntityRestrictions($firstBook, ['view', 'update']);
         $this->setEntityRestrictions($secondBook, ['view']);
 
         $this->setEntityRestrictions($firstBook, ['view', 'update']);
         $this->setEntityRestrictions($secondBook, ['view']);
 

-        $firstBookChapter = $this->app[EntityRepo::class]->createFromInput('chapter',
-                ['name' => 'first book chapter'], $firstBook);
-        $secondBookChapter = $this->app[EntityRepo::class]->createFromInput('chapter',
-                ['name' => 'second book chapter'], $secondBook);
+        $firstBookChapter = $this->newChapter(['name' => 'first book chapter'], $firstBook);
+        $secondBookChapter = $this->newChapter(['name' => 'second book chapter'], $secondBook);

 
         // Create request data
         $reqData = [
 
         // Create request data
         $reqData = [