+
+
+
+
+ All
+ Book
+ Page
+
+
+
-
+
-
For performance reasons, all images are public by default, This option adds a random, hard-to-guess characters in front of image names. Ensure directory indexes are not enabled to prevent easy access.
-
+
+
Select which editor will be used by all users to edit pages.
+
-
+
This image should be 43px in height.
Large images will be scaled down.
-
+
This should be a hex value.
Leave empty to reset to the default color.
-
@@ -78,7 +86,7 @@
Enter a comma separated list of email domains you would like to restrict registration to. Users will be sent an email to confirm their address before being allowed to interact with the application.
Note that users will be able to change their email addresses after successful registration.
-
+
Settings
Users
Roles
diff --git a/resources/views/settings/roles/form.blade.php b/resources/views/settings/roles/form.blade.php
index ba57b4daa..9b0b35d3e 100644
--- a/resources/views/settings/roles/form.blade.php
+++ b/resources/views/settings/roles/form.blade.php
@@ -2,116 +2,130 @@
-
-
-
Role Details
-
-
- @include('form/text', ['name' => 'display_name'])
-
-
-
- @include('form/text', ['name' => 'description'])
-
- System Permissions
+
-
-
-
-
-
-
-
- -
-
-
- + Cancel +
+
+
-
+
- Role Details
+
+
+ @include('form/text', ['name' => 'display_name'])
+
+
+
+ @include('form/text', ['name' => 'description'])
+
+ System Permissions
+ + -
+
+
+
+
+
+
+
Asset Permissions
++ These permissions control default access to the assets within the system. + Permissions on Books, Chapters and Pages will override these permissions. +
+| + | Create | +Edit | +Delete | +
|---|---|---|---|
| Books | ++ + | ++ + + | ++ + + | +
| Chapters | ++ + + | ++ + + | ++ + + | +
| Pages | ++ + + | ++ + + | ++ + + | +
| Images | +@include('settings/roles/checkbox', ['permission' => 'image-create-all']) | ++ + + | ++ + + | +
-
-
-
- - + Cancel +
+
Users in this role
-
-
-
-
+ @foreach($role->users as $user)
+
+ @else
+
Asset Permissions
-
- These permissions control default access to the assets within the system.
- Permissions on Books, Chapters and Pages will override these permissions.
-
| - | Create | -Edit | -Delete | -
|---|---|---|---|
| Books | -- - | -- - - | -- - - | -
| Chapters | -- - - | -- - - | -- - - | -
| Pages | -- - - | -- - - | -- - - | -
| Images | -@include('settings/roles/checkbox', ['permission' => 'image-create-all']) | -- - - | -- - - | -
| + @if(userCan('users-manage') || $currentUser->id == $user->id) + + @endif + {{ $user->name }} + @if(userCan('users-manage') || $currentUser->id == $user->id) + + @endif + | +
+ No users currently in this role. +
+ @endif + - -Cancel - \ No newline at end of file + + \ No newline at end of file diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php index 13036e5dc..b52b6ffe1 100644 --- a/tests/Auth/LdapTest.php +++ b/tests/Auth/LdapTest.php @@ -43,7 +43,7 @@ class LdapTest extends \TestCase ->press('Sign In') ->seePageIs('/') ->see($this->mockUser->name) - ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => 1, 'external_auth_id' => $this->mockUser->name]); + ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $this->mockUser->name]); } public function test_login_works_when_no_uid_provided_by_ldap_server() @@ -67,7 +67,7 @@ class LdapTest extends \TestCase ->press('Sign In') ->seePageIs('/') ->see($this->mockUser->name) - ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => 1, 'external_auth_id' => $ldapDn]); + ->seeInDatabase('users', ['email' => $this->mockUser->email, 'email_confirmed' => false, 'external_auth_id' => $ldapDn]); } public function test_initial_incorrect_details() diff --git a/tests/Entity/MarkdownTest.php b/tests/Entity/MarkdownTest.php new file mode 100644 index 000000000..eaf4d62c3 --- /dev/null +++ b/tests/Entity/MarkdownTest.php @@ -0,0 +1,51 @@ +page = \BookStack\Page::first(); + } + + protected function setMarkdownEditor() + { + $this->setSettings(['app-editor' => 'markdown']); + } + + public function test_default_editor_is_wysiwyg() + { + $this->assertEquals(setting('app-editor'), 'wysiwyg'); + $this->asAdmin()->visit($this->page->getUrl() . '/edit') + ->pageHasElement('#html-editor'); + } + + public function test_markdown_setting_shows_markdown_editor() + { + $this->setMarkdownEditor(); + $this->asAdmin()->visit($this->page->getUrl() . '/edit') + ->pageNotHasElement('#html-editor') + ->pageHasElement('#markdown-editor'); + } + + public function test_markdown_content_given_to_editor() + { + $this->setMarkdownEditor(); + $mdContent = '# hello. This is a test'; + $this->page->markdown = $mdContent; + $this->page->save(); + $this->asAdmin()->visit($this->page->getUrl() . '/edit') + ->seeInField('markdown', $mdContent); + } + + public function test_html_content_given_to_editor_if_no_markdown() + { + $this->setMarkdownEditor(); + $this->asAdmin()->visit($this->page->getUrl() . '/edit') + ->seeInField('markdown', $this->page->html); + } + +} \ No newline at end of file diff --git a/tests/TestCase.php b/tests/TestCase.php index d3b41831e..f46d73e04 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -171,11 +171,27 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase return $this; } - protected function actingAsUsers($usersArray, $callback) + /** + * Check if the page contains the given element. + * @param string $selector + * @return bool + */ + protected function pageHasElement($selector) { - foreach ($usersArray as $user) { - $this->actingAs($user); - $callback($user); - } + $elements = $this->crawler->filter($selector); + $this->assertTrue(count($elements) > 0, "The page does not contain an element matching " . $selector); + return $this; + } + + /** + * Check if the page contains the given element. + * @param string $selector + * @return bool + */ + protected function pageNotHasElement($selector) + { + $elements = $this->crawler->filter($selector); + $this->assertFalse(count($elements) > 0, "The page contains " . count($elements) . " elements matching " . $selector); + return $this; } }