Improve sorting Shelf Books

[bookstack] / tests / TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 840fe0d0894c62a648e2694ce1e17497f9f9571c..2c901981af53cb9e22909fdcc89673cb3cf5fece 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,138 +1,67 @@
-<?php
+<?php namespace Tests;

 
 

+use BookStack\Entities\Models\Entity;

 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Foundation\Testing\DatabaseTransactions;

+use Illuminate\Foundation\Testing\TestCase as BaseTestCase;

 
 

-class TestCase extends Illuminate\Foundation\Testing\TestCase
+abstract class TestCase extends BaseTestCase

 {
 {

-
+    use CreatesApplication;

     use DatabaseTransactions;
     use DatabaseTransactions;

+    use SharedTestHelpers;

 
     /**
      * The base URL to use while testing the application.
 
     /**
      * The base URL to use while testing the application.

-     *

      * @var string
      */
     protected $baseUrl = 'http://localhost';
      * @var string
      */
     protected $baseUrl = 'http://localhost';

-    private $admin;
-
-    /**
-     * Creates the application.
-     *
-     * @return \Illuminate\Foundation\Application
-     */
-    public function createApplication()
-    {
-        $app = require __DIR__.'/../bootstrap/app.php';
-
-        $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
-
-        return $app;
-    }
-
-    public function asAdmin()
-    {
-        if($this->admin === null) {
-            $adminRole = \BookStack\Role::getRole('admin');
-            $this->admin = $adminRole->users->first();
-        }
-        return $this->actingAs($this->admin);
-    }
-
-    /**
-     * Quickly sets an array of settings.
-     * @param $settingsArray
-     */
-    protected function setSettings($settingsArray)
-    {
-        $settings = app('BookStack\Services\SettingService');
-        foreach ($settingsArray as $key => $value) {
-            $settings->put($key, $value);
-        }
-    }

 
     /**
 
     /**

-     * Create a group of entities that belong to a specific user.
-     * @param $creatorUser
-     * @param $updaterUser
-     * @return array
+     * Assert the session contains a specific entry.
+     * @param string $key
+     * @return $this

      */
      */

-    protected function createEntityChainBelongingToUser($creatorUser, $updaterUser = false)
+    protected function assertSessionHas(string $key)

     {
     {

-        if ($updaterUser === false) $updaterUser = $creatorUser;
-        $book = factory(BookStack\Book::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
-        $chapter = factory(BookStack\Chapter::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id]);
-        $page = factory(BookStack\Page::class)->create(['created_by' => $creatorUser->id, 'updated_by' => $updaterUser->id, 'book_id' => $book->id]);
-        $book->chapters()->saveMany([$chapter]);
-        $chapter->pages()->saveMany([$page]);
-        return [
-            'book' => $book,
-            'chapter' => $chapter,
-            'page' => $page
-        ];
+        $this->assertTrue(session()->has($key), "Session does not contain a [{$key}] entry");
+        return $this;

     }
 
     /**
     }
 
     /**

-     * Quick way to create a new user
-     * @param array $attributes
-     * @return mixed
+     * Override of the get method so we can get visibility of custom TestResponse methods.
+     * @param  string  $uri
+     * @param  array  $headers
+     * @return TestResponse

      */
      */

-    protected function getNewUser($attributes = [])
+    public function get($uri, array $headers = [])

     {
     {

-        $user = factory(\BookStack\User::class)->create($attributes);
-        $role = \BookStack\Role::getRole('editor');
-        $user->attachRole($role);;
-        return $user;
+        return parent::get($uri, $headers);

     }
 
     /**
     }
 
     /**

-     * Quick way to create a new user without any permissions
-     * @param array $attributes
-     * @return mixed
+     * Create the test response instance from the given response.
+     *
+     * @param  \Illuminate\Http\Response $response
+     * @return TestResponse

      */
      */

-    protected function getNewBlankUser($attributes = [])
+    protected function createTestResponse($response)

     {
     {

-        $user = factory(\BookStack\User::class)->create($attributes);
-        return $user;
+        return TestResponse::fromBaseResponse($response);

     }
 
     /**
     }
 
     /**

-     * Assert that a given string is seen inside an element.
-     *
-     * @param  bool|string|null $element
-     * @param  integer          $position
-     * @param  string           $text
-     * @param  bool             $negate
-     * @return $this
+     * Assert that an activity entry exists of the given key.
+     * Checks the activity belongs to the given entity if provided.

      */
      */

-    protected function seeInNthElement($element, $position, $text, $negate = false)
+    protected function assertActivityExists(string $type, Entity $entity = null)

     {
     {

-        $method = $negate ? 'assertNotRegExp' : 'assertRegExp';
-
-        $rawPattern = preg_quote($text, '/');
-
-        $escapedPattern = preg_quote(e($text), '/');
-
-        $content = $this->crawler->filter($element)->eq($position)->html();
-
-        $pattern = $rawPattern == $escapedPattern
-            ? $rawPattern : "({$rawPattern}|{$escapedPattern})";
+        $detailsToCheck = ['type' => $type];

 
 

-        $this->$method("/$pattern/i", $content);
-
-        return $this;
-    }
+        if ($entity) {
+            $detailsToCheck['entity_type'] = $entity->getMorphClass();
+            $detailsToCheck['entity_id'] = $entity->id;
+        }

 
 

-    /**
-     * Click the text within the selected element.
-     * @param $parentElement
-     * @param $linkText
-     * @return $this
-     */
-    protected function clickInElement($parentElement, $linkText)
-    {
-        $elem = $this->crawler->filter($parentElement);
-        $link = $elem->selectLink($linkText);
-        $this->visit($link->link()->getUri());
-        return $this;
+        $this->assertDatabaseHas('activities', $detailsToCheck);

     }
     }

-}
+}
\ No newline at end of file