add missing icon, fix name conventions

[bookstack] / tests / TestCase.php

diff --git a/tests/TestCase.php b/tests/TestCase.php
index 6a8c2d732b65dc123de08569c6f4c2da7c2ac3bc..94751b0047843369a6a729b06fc7911456b1ead5 100644 (file)
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,38 +1,27 @@
-<?php
+<?php namespace Tests;

 
 

+use BookStack\Book;
+use BookStack\Chapter;
+use BookStack\Repos\EntityRepo;
+use BookStack\Role;
+use BookStack\Services\SettingService;

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

-use Symfony\Component\DomCrawler\Crawler;
+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;
 

+    protected $admin;
+    protected $editor;
+

     /**
      * 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';
 

-    // Local user instances
-    private $admin;
-    private $editor;
-
-    /**
-     * 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;
-    }
-

     /**
      * Set the current user context to be an admin.
      * @return $this
     /**
      * Set the current user context to be an admin.
      * @return $this


@@ -48,179 +37,74 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase
      */
     public function getAdmin() {
         if($this->admin === null) {
      */
     public function getAdmin() {
         if($this->admin === null) {

-            $adminRole = \BookStack\Role::getRole('admin');
+            $adminRole = Role::getSystemRole('admin');

             $this->admin = $adminRole->users->first();
         }
         return $this->admin;
     }
 
     /**
             $this->admin = $adminRole->users->first();
         }
         return $this->admin;
     }
 
     /**

-     * Set the current editor context to be an editor.
+     * Set the current user context to be an editor.

      * @return $this
      */
     public function asEditor()
     {
      * @return $this
      */
     public function asEditor()
     {

-        if($this->editor === null) {
-            $this->editor = $this->getEditor();
-        }
-        return $this->actingAs($this->editor);
+        return $this->actingAs($this->getEditor());

     }
 
     }
 

-    /**
-     * 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
-     */
-    protected function createEntityChainBelongingToUser($creatorUser, $updaterUser = false)
-    {
-        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]);
-        $restrictionService = $this->app[\BookStack\Services\PermissionService::class];
-        $restrictionService->buildJointPermissionsForEntity($book);
-        return [
-            'book' => $book,
-            'chapter' => $chapter,
-            'page' => $page
-        ];
-    }
-
-    /**
-     * Quick way to create a new user
-     * @param array $attributes
-     * @return mixed
-     */
-    protected function getEditor($attributes = [])
-    {
-        $user = factory(\BookStack\User::class)->create($attributes);
-        $role = \BookStack\Role::getRole('editor');
-        $user->attachRole($role);;
-        return $user;
-    }

 
     /**
 
     /**

-     * Quick way to create a new user without any permissions
-     * @param array $attributes
+     * Get a editor user.

      * @return mixed
      */
      * @return mixed
      */

-    protected function getNewBlankUser($attributes = [])
-    {
-        $user = factory(\BookStack\User::class)->create($attributes);
-        return $user;
-    }
-
-    /**
-     * 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
-     */
-    protected function seeInNthElement($element, $position, $text, $negate = false)
-    {
-        $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})";
-
-        $this->$method("/$pattern/i", $content);
-
-        return $this;
-    }
-
-    /**
-     * Assert that the current page matches a given URI.
-     *
-     * @param  string  $uri
-     * @return $this
-     */
-    protected function seePageUrlIs($uri)
-    {
-        $this->assertEquals(
-            $uri, $this->currentUri, "Did not land on expected page [{$uri}].\n"
-        );
-
-        return $this;
+    public function getEditor() {
+        if($this->editor === null) {
+            $editorRole = Role::getRole('editor');
+            $this->editor = $editorRole->users->first();
+        }
+        return $this->editor;

     }
 
     /**
     }
 
     /**

-     * Do a forced visit that does not error out on exception.
-     * @param string $uri
-     * @param array $parameters
-     * @param array $cookies
-     * @param array $files
-     * @return $this
+     * Create and return a new book.
+     * @param array $input
+     * @return Book

      */
      */

-    protected function forceVisit($uri, $parameters = [], $cookies = [], $files = [])
-    {
-        $method = 'GET';
-        $uri = $this->prepareUrlForRequest($uri);
-        $this->call($method, $uri, $parameters, $cookies, $files);
-        $this->clearInputs()->followRedirects();
-        $this->currentUri = $this->app->make('request')->fullUrl();
-        $this->crawler = new Crawler($this->response->getContent(), $uri);
-        return $this;
+    public function newBook($input = ['name' => 'test book', 'description' => 'My new test book']) {
+        return $this->app[EntityRepo::class]->createFromInput('book', $input, false);

     }
 
     /**
     }
 
     /**

-     * Click the text within the selected element.
-     * @param $parentElement
-     * @param $linkText
-     * @return $this
+     * Create and return a new test chapter
+     * @param array $input
+     * @param Book $book
+     * @return Chapter

      */
      */

-    protected function clickInElement($parentElement, $linkText)
-    {
-        $elem = $this->crawler->filter($parentElement);
-        $link = $elem->selectLink($linkText);
-        $this->visit($link->link()->getUri());
-        return $this;
+    public function newChapter($input = ['name' => 'test chapter', 'description' => 'My new test chapter'], Book $book) {
+        return $this->app[EntityRepo::class]->createFromInput('chapter', $input, $book);

     }
 
     /**
     }
 
     /**

-     * Check if the page contains the given element.
-     * @param  string  $selector
-     * @return bool
+     * Create and return a new test page
+     * @param array $input
+     * @return Chapter

      */
      */

-    protected function pageHasElement($selector)
-    {
-        $elements = $this->crawler->filter($selector);
-        $this->assertTrue(count($elements) > 0, "The page does not contain an element matching " . $selector);
-        return $this;
+    public function newPage($input = ['name' => 'test page', 'html' => 'My new test page']) {
+        $book = Book::first();
+        $entityRepo = $this->app[EntityRepo::class];
+        $draftPage = $entityRepo->getDraftPage($book);
+        return $entityRepo->publishPageDraft($draftPage, $input);

     }
 
     /**
     }
 
     /**

-     * Check if the page contains the given element.
-     * @param  string  $selector
-     * @return bool
+     * Quickly sets an array of settings.
+     * @param $settingsArray

      */
      */

-    protected function pageNotHasElement($selector)
+    protected function setSettings($settingsArray)

     {
     {

-        $elements = $this->crawler->filter($selector);
-        $this->assertFalse(count($elements) > 0, "The page contains " . count($elements) . " elements matching " . $selector);
-        return $this;
+        $settings = app(SettingService::class);
+        foreach ($settingsArray as $key => $value) {
+            $settings->put($key, $value);
+        }

     }
     }

-}
+}
\ No newline at end of file