X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/221458ccfd70e1b2c6791018792732b247e55d65..refs/pull/3245/head:/tests/Entity/EntitySearchTest.php

diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index 0ef46d3a7..ab5777e98 100644
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -18,20 +18,17 @@ class EntitySearchTest extends TestCase
 
         $search = $this->asEditor()->get('/search?term=' . urlencode($page->name));
         $search->assertSee('Search Results');
-
-        $title = strip_tags($search->getElementHtml('.entity-list-item-name'));
-        $this->assertEquals($page->name, $title);
+        $search->assertSeeText($page->name, true);
     }
 
     public function test_bookshelf_search()
     {
         /** @var Bookshelf $shelf */
         $shelf = Bookshelf::query()->first();
-        $search = $this->asEditor()->get('/search?term=' . urlencode(mb_substr($shelf->name, 0, 3)) . '  {type:bookshelf}');
-        $search->assertStatus(200);
 
-        $title = strip_tags($search->getElementHtml('.entity-list-item-name'));
-        $this->assertEquals($shelf->name, $title);
+        $search = $this->asEditor()->get('/search?term=' . urlencode($shelf->name) . '  {type:bookshelf}');
+        $search->assertSee('Search Results');
+        $search->assertSeeText($shelf->name, true);
     }
 
     public function test_invalid_page_search()
@@ -406,6 +403,17 @@ class EntitySearchTest extends TestCase
         $search->assertElementContains('.tag-value.highlight', 'MeowieCat');
     }
 
+    public function test_match_highlighting_works_with_multibyte_content()
+    {
+        $this->newPage([
+            'name' => 'Test Page',
+            'html' => '<p>На мен ми трябва нещо добро test</p>',
+        ]);
+
+        $search = $this->asEditor()->get('/search?term=' . urlencode('На мен ми трябва нещо добро'));
+        $search->assertSee('<strong>На</strong> <strong>мен</strong> <strong>ми</strong> <strong>трябва</strong> <strong>нещо</strong> <strong>добро</strong> test', false);
+    }
+
     public function test_html_entities_in_item_details_remains_escaped_in_search_results()
     {
         $this->newPage(['name' => 'My <cool> TestPageContent', 'html' => '<p>My supercool &lt;great&gt; TestPageContent page</p>']);
@@ -414,4 +422,11 @@ class EntitySearchTest extends TestCase
         $search->assertSee('My &lt;cool&gt; <strong>TestPageContent</strong>', false);
         $search->assertSee('My supercool &lt;great&gt; <strong>TestPageContent</strong> page', false);
     }
+
+    public function test_searches_with_user_filters_adds_them_into_advanced_search_form()
+    {
+        $resp = $this->asEditor()->get('/search?term=' . urlencode('test {updated_by:me} {created_by:dan}'));
+        $resp->assertElementExists('form input[type="hidden"][name="filters[updated_by]"][value="me"]');
+        $resp->assertElementExists('form input[type="hidden"][name="filters[created_by]"][value="dan"]');
+    }
 }