Also add whitespace on <br /> and <hr /> tags

wagtail/core/rich_text/__init__.py

@@ -45,6 +45,8 @@ def get_text_for_indexing(richtext):
     """
     # insert space after </p>, </h1> - </h6>, </li> and </blockquote> tags
     richtext = re.sub(r'(</(p|h\d|li|blockquote)>)', r'\1 ', richtext, flags=re.IGNORECASE)
+    # also insert space after <br /> and <hr />
+    richtext = re.sub(r'(<(br|hr)\s*/>)', r'\1 ', richtext, flags=re.IGNORECASE)
     return unescape(strip_tags(richtext).strip())
 
 

wagtail/core/tests/test_rich_text.py

@@ -176,10 +176,10 @@ class TestRichTextField(TestCase):
 
     def test_get_searchable_content_whitespace(self):
         christmas_page = EventPage.objects.get(url_path='/home/events/christmas/')
-        christmas_page.body = '<p>mashed</p><p>po<i>ta</i>toes</p>'
+        christmas_page.body = '<p>buttery<br />mashed</p><p>po<i>ta</i>toes</p>'
         christmas_page.save_revision(submitted_for_moderation=False)
 
         body_field = christmas_page._meta.get_field('body')
         value = body_field.value_from_object(christmas_page)
         result = body_field.get_searchable_content(value)
-        self.assertEqual(result, ['mashed potatoes'])
+        self.assertEqual(result, ['buttery mashed potatoes'])