+ @include('settings.navbar-with-version', ['selected' => 'maintenance'])
{{ trans('settings.maint_image_cleanup') }}
diff --git a/resources/views/settings/navbar-with-version.blade.php b/resources/views/settings/navbar-with-version.blade.php
new file mode 100644
index 000000000..c02c370fe
--- /dev/null
+++ b/resources/views/settings/navbar-with-version.blade.php
@@ -0,0 +1,15 @@
+{{--
+$selected - String name of the selected tab
+$version - Version of bookstack to display
+--}}
+
+
+ @include('settings.navbar', ['selected' => $selected])
+
+
+
+
\ No newline at end of file
diff --git a/tests/Auth/Saml2Test.php b/tests/Auth/Saml2Test.php
index 7303d4bd8..d58162497 100644
--- a/tests/Auth/Saml2Test.php
+++ b/tests/Auth/Saml2Test.php
@@ -319,6 +319,33 @@ class Saml2Test extends TestCase
$homeGet->assertRedirect('/register/confirm/awaiting');
}
+ public function test_login_where_existing_non_saml_user_shows_warning()
+ {
+ $this->post('/saml2/login');
+ config()->set(['saml2.onelogin.strict' => false]);
+
+ // Make the user pre-existing in DB with different auth_id
+ User::query()->forceCreate([
+ 'email' => 'user@example.com',
+ 'external_auth_id' => 'old_system_user_id',
+ 'email_confirmed' => false,
+ 'name' => 'Barry Scott'
+ ]);
+
+ $this->withPost(['SAMLResponse' => $this->acsPostData], function () {
+ $acsPost = $this->post('/saml2/acs');
+ $acsPost->assertRedirect('/login');
+ $this->assertFalse($this->isAuthenticated());
+ $this->assertDatabaseHas('users', [
+ 'email' => 'user@example.com',
+ 'external_auth_id' => 'old_system_user_id',
+ ]);
+
+ $loginGet = $this->get('/login');
+ $loginGet->assertSee("A user with the email user@example.com already exists but with different credentials");
+ });
+ }
+
protected function withGet(array $options, callable $callback)
{
return $this->withGlobal($_GET, $options, $callback);
diff --git a/tests/Entity/PageContentTest.php b/tests/Entity/PageContentTest.php
index d3b6224c4..69b46b06e 100644
--- a/tests/Entity/PageContentTest.php
+++ b/tests/Entity/PageContentTest.php
@@ -71,6 +71,25 @@ class PageContentTest extends TestCase
$pageResp->assertSee($content);
}
+ public function test_page_includes_rendered_on_book_export()
+ {
+ $page = Page::query()->first();
+ $secondPage = Page::query()
+ ->where('book_id', '!=', $page->book_id)
+ ->first();
+
+ $content = '
my cat is awesome and scratchy
';
+ $secondPage->html = $content;
+ $secondPage->save();
+
+ $page->html = "{{@{$secondPage->id}#bkmrk-meow}}";
+ $page->save();
+
+ $this->asEditor();
+ $htmlContent = $this->get($page->book->getUrl('/export/html'));
+ $htmlContent->assertSee('my cat is awesome and scratchy');
+ }
+
public function test_page_content_scripts_removed_by_default()
{
$this->asEditor();