Skip intermediate login page with single provider

[bookstack] / tests / SharedTestHelpers.php

diff --git a/tests/SharedTestHelpers.php b/tests/SharedTestHelpers.php
index cd0d244c986c481108f1fb4b501d113858a17dd7..cbf49bf71f424f747e97bc04b3e3ff55fa6bb50b 100644 (file)
--- a/tests/SharedTestHelpers.php
+++ b/tests/SharedTestHelpers.php
@@ -18,13 +18,18 @@ use BookStack\Entities\Repos\ChapterRepo;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Settings\SettingService;
 use BookStack\Uploads\HttpFetcher;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Settings\SettingService;
 use BookStack\Uploads\HttpFetcher;

-use Illuminate\Foundation\Testing\Assert as PHPUnit;
+use GuzzleHttp\Client;
+use GuzzleHttp\Handler\MockHandler;
+use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Middleware;

 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\Log;

+use Illuminate\Testing\Assert as PHPUnit;

 use Mockery;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use Mockery;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;

+use Psr\Http\Client\ClientInterface;

 
 trait SharedTestHelpers
 {
 
 trait SharedTestHelpers
 {


@@ -89,7 +94,7 @@ trait SharedTestHelpers
     /**
      * Get a user that's not a system user such as the guest user.
      */
     /**
      * Get a user that's not a system user such as the guest user.
      */

-    public function getNormalUser()
+    public function getNormalUser(): User

     {
         return User::query()->where('system_name', '=', null)->get()->last();
     }
     {
         return User::query()->where('system_name', '=', null)->get()->last();
     }


@@ -122,7 +127,7 @@ trait SharedTestHelpers
     /**
      * Create and return a new test chapter.
      */
     /**
      * Create and return a new test chapter.
      */

-    public function newChapter(array $input = ['name' => 'test chapter', 'description' => 'My new test chapter'], Book $book): Chapter
+    public function newChapter(array $input, Book $book): Chapter

     {
         return app(ChapterRepo::class)->create($input, $book);
     }
     {
         return app(ChapterRepo::class)->create($input, $book);
     }


@@ -205,7 +210,7 @@ trait SharedTestHelpers
     protected function createNewRole(array $permissions = []): Role
     {
         $permissionRepo = app(PermissionsRepo::class);
     protected function createNewRole(array $permissions = []): Role
     {
         $permissionRepo = app(PermissionsRepo::class);

-        $roleData = factory(Role::class)->make()->toArray();
+        $roleData = Role::factory()->make()->toArray();

         $roleData['permissions'] = array_flip($permissions);
 
         return $permissionRepo->saveNewRole($roleData);
         $roleData['permissions'] = array_flip($permissions);
 
         return $permissionRepo->saveNewRole($roleData);


@@ -213,6 +218,7 @@ trait SharedTestHelpers
 
     /**
      * Create a group of entities that belong to a specific user.
 
     /**
      * Create a group of entities that belong to a specific user.

+     *

      * @return array{book: Book, chapter: Chapter, page: Page}
      */
     protected function createEntityChainBelongingToUser(User $creatorUser, ?User $updaterUser = null): array
      * @return array{book: Book, chapter: Chapter, page: Page}
      */
     protected function createEntityChainBelongingToUser(User $creatorUser, ?User $updaterUser = null): array


@@ -222,9 +228,9 @@ trait SharedTestHelpers
         }
 
         $userAttrs = ['created_by' => $creatorUser->id, 'owned_by' => $creatorUser->id, 'updated_by' => $updaterUser->id];
         }
 
         $userAttrs = ['created_by' => $creatorUser->id, 'owned_by' => $creatorUser->id, 'updated_by' => $updaterUser->id];

-        $book = factory(Book::class)->create($userAttrs);
-        $chapter = factory(Chapter::class)->create(array_merge(['book_id' => $book->id], $userAttrs));
-        $page = factory(Page::class)->create(array_merge(['book_id' => $book->id, 'chapter_id' => $chapter->id], $userAttrs));
+        $book = Book::factory()->create($userAttrs);
+        $chapter = Chapter::factory()->create(array_merge(['book_id' => $book->id], $userAttrs));
+        $page = Page::factory()->create(array_merge(['book_id' => $book->id, 'chapter_id' => $chapter->id], $userAttrs));

         $restrictionService = $this->app[PermissionService::class];
         $restrictionService->buildJointPermissionsForEntity($book);
 
         $restrictionService = $this->app[PermissionService::class];
         $restrictionService->buildJointPermissionsForEntity($book);
 


@@ -243,6 +249,24 @@ trait SharedTestHelpers
             ->andReturn($returnData);
     }
 
             ->andReturn($returnData);
     }
 

+    /**
+     * Mock the http client used in BookStack.
+     * Returns a reference to the container which holds all history of http transactions.
+     *
+     * @link https://docs.guzzlephp.org/en/stable/testing.html#history-middleware
+     */
+    protected function &mockHttpClient(array $responses = []): array
+    {
+        $container = [];
+        $history = Middleware::history($container);
+        $mock = new MockHandler($responses);
+        $handlerStack = new HandlerStack($mock);
+        $handlerStack->push($history);
+        $this->app[ClientInterface::class] = new Client(['handler' => $handlerStack]);
+
+        return $container;
+    }
+

     /**
      * Run a set test with the given env variable.
      * Remembers the original and resets the value after test.
     /**
      * Run a set test with the given env variable.
      * Remembers the original and resets the value after test.


@@ -322,6 +346,15 @@ trait SharedTestHelpers
             );
     }
 
             );
     }
 

+    /**
+     * Assert that the session has a particular error notification message set.
+     */
+    protected function assertSessionError(string $message)
+    {
+        $error = session()->get('error');
+        PHPUnit::assertTrue($error === $message, "Failed asserting the session contains an error. \nFound: {$error}\nExpecting: {$message}");
+    }
+

     /**
      * Set a test handler as the logging interface for the application.
      * Allows capture of logs for checking against during tests.
     /**
      * Set a test handler as the logging interface for the application.
      * Allows capture of logs for checking against during tests.