Fixed failing tests due to search highlighting changes

diff --git a/app/Entities/Tools/SearchIndex.php b/app/Entities/Tools/SearchIndex.php
index 702606be9640f0d528fc6d332b1102cb656610fa..d748c1695d46369c314eb6f6f121b0bc9dce3649 100644 (file)
--- a/app/Entities/Tools/SearchIndex.php
+++ b/app/Entities/Tools/SearchIndex.php
@@ -223,7 +223,7 @@ class SearchIndex
         if ($entity instanceof Page) {
             $bodyTermsMap = $this->generateTermScoreMapFromHtml($entity->html);
         } else {
         if ($entity instanceof Page) {
             $bodyTermsMap = $this->generateTermScoreMapFromHtml($entity->html);
         } else {

-            $bodyTermsMap = $this->generateTermScoreMapFromText($entity->description, $entity->searchFactor);
+            $bodyTermsMap = $this->generateTermScoreMapFromText($entity->description ?? '', $entity->searchFactor);

         }
 
         $mergedScoreMap = $this->mergeTermScoreMaps($nameTermsMap, $bodyTermsMap, $tagTermsMap);
         }
 
         $mergedScoreMap = $this->mergeTermScoreMaps($nameTermsMap, $bodyTermsMap, $tagTermsMap);

diff --git a/tests/Entity/EntitySearchTest.php b/tests/Entity/EntitySearchTest.php
index f935f13317b9d5c6abd49a26dfe1e285ad07f4cf..0ef46d3a79ba116e4ff97f33276b9276ab71ce69 100644 (file)
--- a/tests/Entity/EntitySearchTest.php
+++ b/tests/Entity/EntitySearchTest.php
@@ -18,15 +18,20 @@ class EntitySearchTest extends TestCase
 
         $search = $this->asEditor()->get('/search?term=' . urlencode($page->name));
         $search->assertSee('Search Results');
 
         $search = $this->asEditor()->get('/search?term=' . urlencode($page->name));
         $search->assertSee('Search Results');

-        $search->assertSee($page->name);
+
+        $title = strip_tags($search->getElementHtml('.entity-list-item-name'));
+        $this->assertEquals($page->name, $title);

     }
 
     public function test_bookshelf_search()
     {
     }
 
     public function test_bookshelf_search()
     {

-        $shelf = Bookshelf::first();
+        /** @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);
         $search = $this->asEditor()->get('/search?term=' . urlencode(mb_substr($shelf->name, 0, 3)) . '  {type:bookshelf}');
         $search->assertStatus(200);

-        $search->assertSee($shelf->name);
+
+        $title = strip_tags($search->getElementHtml('.entity-list-item-name'));
+        $this->assertEquals($shelf->name, $title);

     }
 
     public function test_invalid_page_search()
     }
 
     public function test_invalid_page_search()