From db0816c0a8c477efcc72658435a38db8b7f17b00 Mon Sep 17 00:00:00 2001
From: Andrew <acekane1@gmail.com>
Date: Fri, 2 Mar 2018 23:22:31 -0800
Subject: [PATCH] Fixed highlighting for ES5

---
 lib/searchkick/query.rb | 6 +++++-
 test/highlight_test.rb  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/searchkick/query.rb b/lib/searchkick/query.rb
index 139f746..1bdced8 100644
--- a/lib/searchkick/query.rb
+++ b/lib/searchkick/query.rb
@@ -659,7 +659,7 @@ module Searchkick
     def set_highlights(payload, fields)
       payload[:highlight] = {
         fields: Hash[fields.map { |f| [f, {}] }],
-        fragment_size: 0
+        fragment_size: below60? ? 30000 : 0
       }
 
       if options[:highlight].is_a?(Hash)
@@ -960,6 +960,10 @@ module Searchkick
       end
     end
 
+    def below60?
+      Searchkick.server_below?("6.0.0-alpha1")
+    end
+
     def below61?
       Searchkick.server_below?("6.1.0-alpha1")
     end
diff --git a/test/highlight_test.rb b/test/highlight_test.rb
index f4217ec..6e8b659 100644
--- a/test/highlight_test.rb
+++ b/test/highlight_test.rb
@@ -17,7 +17,7 @@ class HighlightTest < Minitest::Test
   end
 
   def test_very_long
-    store_names ["Two Door Cinema Club " * 100]
+    store_names [("Two Door Cinema Club " * 100).strip]
     assert_equal ("Two Door <em>Cinema</em> Club " * 100).strip, Product.search("cinema", highlight: true).highlights.first[:name]
   end
 
--
libgit2 0.21.0