test/test_helper.rb in searchkick-2.3.1 vs test/test_helper.rb in searchkick-2.3.2

@@ -40,10 +40,14 @@
 
 def elasticsearch_below50?
   Searchkick.server_below?("5.0.0-alpha1")
 end
 
+def elasticsearch_below60?
+  Searchkick.server_below?("6.0.0-alpha1")
+end
+
 def elasticsearch_below22?
   Searchkick.server_below?("2.2.0")
 end
 
 def nobrainer?
@@ -442,10 +446,11 @@
   end
 end
 
 class Store
   searchkick \
+    default_fields: elasticsearch_below60? ? nil : [:name],
     routing: true,
     merge_mappings: true,
     mappings: {
       store: {
         properties: {
@@ -463,10 +468,11 @@
   end
 end
 
 class Region
   searchkick \
+    default_fields: elasticsearch_below60? ? nil : [:name],
     geo_shape: {
       territory: {tree: "quadtree", precision: "10km"}
     }
 
   attr_accessor :territory
@@ -480,10 +486,11 @@
   end
 end
 
 class Speaker
   searchkick \
+    default_fields: elasticsearch_below60? ? nil : [:name],
     conversions: ["conversions_a", "conversions_b"]
 
   attr_accessor :conversions_a, :conversions_b, :aisle
 
   def search_data
@@ -495,9 +502,10 @@
   end
 end
 
 class Animal
   searchkick \
+    default_fields: elasticsearch_below60? ? nil : [:name],
     text_start: [:name],
     suggest: [:name],
     index_name: -> { "#{name.tableize}-#{Date.today.year}#{Searchkick.index_suffix}" },
     callbacks: defined?(ActiveJob) ? :async : true
     # wordnet: true