Allow toggling between grid and list view in shelf view (shelves.show)

[bookstack] / tests / SharedTestHelpers.php

diff --git a/tests/SharedTestHelpers.php b/tests/SharedTestHelpers.php
index 1d87e942aaf2167e10dbaed48f0a20f887511b94..3433f3b832f86d61411729ea23983905596d57d0 100644 (file)
--- a/tests/SharedTestHelpers.php
+++ b/tests/SharedTestHelpers.php
@@ -1,17 +1,23 @@
 <?php namespace Tests;
 
 <?php namespace Tests;
 

+use BookStack\Auth\User;

 use BookStack\Entities\Book;
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Chapter;
 use BookStack\Entities\Entity;
 use BookStack\Entities\Page;
 use BookStack\Entities\Book;
 use BookStack\Entities\Bookshelf;
 use BookStack\Entities\Chapter;
 use BookStack\Entities\Entity;
 use BookStack\Entities\Page;

-use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Repos\BookshelfRepo;
+use BookStack\Entities\Repos\ChapterRepo;

 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Auth\Role;
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Settings\SettingService;
 use BookStack\Uploads\HttpFetcher;
 use BookStack\Auth\Permissions\PermissionsRepo;
 use BookStack\Auth\Role;
 use BookStack\Auth\Permissions\PermissionService;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Settings\SettingService;
 use BookStack\Uploads\HttpFetcher;

+use Illuminate\Support\Env;
+use Mockery;
+use Throwable;

 
 trait SharedTestHelpers
 {
 
 trait SharedTestHelpers
 {


@@ -69,7 +75,7 @@ trait SharedTestHelpers
      */
     protected function getViewer($attributes = [])
     {
      */
     protected function getViewer($attributes = [])
     {

-        $user = \BookStack\Auth\Role::getRole('viewer')->users()->first();
+        $user = Role::getRole('viewer')->users()->first();

         if (!empty($attributes)) $user->forceFill($attributes)->save();
         return $user;
     }
         if (!empty($attributes)) $user->forceFill($attributes)->save();
         return $user;
     }


@@ -77,20 +83,21 @@ trait SharedTestHelpers
     /**
      * Regenerate the permission for an entity.
      * @param Entity $entity
     /**
      * Regenerate the permission for an entity.
      * @param Entity $entity

+     * @throws Throwable

      */
     protected function regenEntityPermissions(Entity $entity)
     {
      */
     protected function regenEntityPermissions(Entity $entity)
     {

-        app(PermissionService::class)->buildJointPermissionsForEntity($entity);
+        $entity->rebuildPermissions();

         $entity->load('jointPermissions');
     }
 
     /**
      * Create and return a new bookshelf.
      * @param array $input
         $entity->load('jointPermissions');
     }
 
     /**
      * Create and return a new bookshelf.
      * @param array $input

-     * @return \BookStack\Entities\Bookshelf
+     * @return Bookshelf

      */
     public function newShelf($input = ['name' => 'test shelf', 'description' => 'My new test shelf']) {
      */
     public function newShelf($input = ['name' => 'test shelf', 'description' => 'My new test shelf']) {

-        return app(EntityRepo::class)->createFromInput('bookshelf', $input, false);
+        return app(BookshelfRepo::class)->create($input, []);

     }
 
     /**
     }
 
     /**


@@ -99,29 +106,30 @@ trait SharedTestHelpers
      * @return Book
      */
     public function newBook($input = ['name' => 'test book', 'description' => 'My new test book']) {
      * @return Book
      */
     public function newBook($input = ['name' => 'test book', 'description' => 'My new test book']) {

-        return app(EntityRepo::class)->createFromInput('book', $input, false);
+        return app(BookRepo::class)->create($input);

     }
 
     /**
      * Create and return a new test chapter
      * @param array $input
      * @param Book $book
     }
 
     /**
      * Create and return a new test chapter
      * @param array $input
      * @param Book $book

-     * @return \BookStack\Entities\Chapter
+     * @return Chapter

      */
     public function newChapter($input = ['name' => 'test chapter', 'description' => 'My new test chapter'], Book $book) {
      */
     public function newChapter($input = ['name' => 'test chapter', 'description' => 'My new test chapter'], Book $book) {

-        return app(EntityRepo::class)->createFromInput('chapter', $input, $book);
+        return app(ChapterRepo::class)->create($input, $book);

     }
 
     /**
      * Create and return a new test page
      * @param array $input
      * @return Page
     }
 
     /**
      * Create and return a new test page
      * @param array $input
      * @return Page

+     * @throws Throwable

      */
     public function newPage($input = ['name' => 'test page', 'html' => 'My new test page']) {
         $book = Book::first();
         $pageRepo = app(PageRepo::class);
      */
     public function newPage($input = ['name' => 'test page', 'html' => 'My new test page']) {
         $book = Book::first();
         $pageRepo = app(PageRepo::class);

-        $draftPage = $pageRepo->getDraftPage($book);
-        return $pageRepo->publishPageDraft($draftPage, $input);
+        $draftPage = $pageRepo->getNewDraftPage($book);
+        return $pageRepo->publishDraft($draftPage, $input);

     }
 
     /**
     }
 
     /**


@@ -166,10 +174,10 @@ trait SharedTestHelpers
 
     /**
      * Give the given user some permissions.
 
     /**
      * Give the given user some permissions.

-     * @param \BookStack\Auth\User $user
+     * @param User $user

      * @param array $permissions
      */
      * @param array $permissions
      */

-    protected function giveUserPermissions(\BookStack\Auth\User $user, $permissions = [])
+    protected function giveUserPermissions(User $user, $permissions = [])

     {
         $newRole = $this->createNewRole($permissions);
         $user->attachRole($newRole);
     {
         $newRole = $this->createNewRole($permissions);
         $user->attachRole($newRole);


@@ -197,11 +205,61 @@ trait SharedTestHelpers
      */
     protected function mockHttpFetch($returnData, int $times = 1)
     {
      */
     protected function mockHttpFetch($returnData, int $times = 1)
     {

-        $mockHttp = \Mockery::mock(HttpFetcher::class);
+        $mockHttp = Mockery::mock(HttpFetcher::class);

         $this->app[HttpFetcher::class] = $mockHttp;
         $mockHttp->shouldReceive('fetch')
             ->times($times)
             ->andReturn($returnData);
     }
 
         $this->app[HttpFetcher::class] = $mockHttp;
         $mockHttp->shouldReceive('fetch')
             ->times($times)
             ->andReturn($returnData);
     }
 

+    /**
+     * Run a set test with the given env variable.
+     * Remembers the original and resets the value after test.
+     * @param string $name
+     * @param $value
+     * @param callable $callback
+     */
+    protected function runWithEnv(string $name, $value, callable $callback)
+    {
+        Env::disablePutenv();
+        $originalVal = $_SERVER[$name] ?? null;
+
+        if (is_null($value)) {
+            unset($_SERVER[$name]);
+        } else {
+            $_SERVER[$name] = $value;
+        }
+
+        $this->refreshApplication();
+        $callback();
+
+        if (is_null($originalVal)) {
+            unset($_SERVER[$name]);
+        } else {
+            $_SERVER[$name] = $originalVal;
+        }
+    }
+
+    /**
+     * Check the keys and properties in the given map to include
+     * exist, albeit not exclusively, within the map to check.
+     * @param array $mapToInclude
+     * @param array $mapToCheck
+     * @param string $message
+     */
+    protected function assertArrayMapIncludes(array $mapToInclude, array $mapToCheck, string $message = '') : void
+    {
+        $passed = true;
+
+        foreach ($mapToInclude as $key => $value) {
+            if (!isset($mapToCheck[$key]) || $mapToCheck[$key] !== $mapToInclude[$key]) {
+                $passed = false;
+            }
+        }
+
+        $toIncludeStr = print_r($mapToInclude, true);
+        $toCheckStr = print_r($mapToCheck, true);
+        self::assertThat($passed, self::isTrue(), "Failed asserting that given map:\n\n{$toCheckStr}\n\nincludes:\n\n{$toIncludeStr}");
+    }
+

 }
\ No newline at end of file
 }
\ No newline at end of file