Fix 5.6 compatibility in integration tests

robbavey · robbavey · commit 0af1cfb24341 · 2017-09-01T18:56:21.000Z
Change ES 5.6 mapping, as join fields only support single type mapping Fixes logstash-plugins#665
diff --git a/spec/integration/outputs/parent_spec.rb b/spec/integration/outputs/parent_spec.rb
@@ -104,6 +104,12 @@
             }
           }
         }
+        if ESHelper.es_version_satisfies?('<6')
+          mapping.merge!({
+                 "settings" => {
+                   "mapping.single_type" => true
+                 }})
+        end
         Manticore.put("#{index_url}", {:body => mapping.to_json, :headers => default_headers}).call
         pdoc = { "message" => "ohayo", join_field => parent_relation }
         Manticore.put("#{index_url}/#{type}/#{parent_id}", {:body => pdoc.to_json, :headers => default_headers}).call

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,12 @@`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
	`107`	`+ if ESHelper.es_version_satisfies?('<6')`
	`108`	`+ mapping.merge!({`
	`109`	`+ "settings" => {`
	`110`	`+ "mapping.single_type" => true`
	`111`	`+ }})`
	`112`	`+ end`
`107`	`113`	`Manticore.put("#{index_url}", {:body => mapping.to_json, :headers => default_headers}).call`
`108`	`114`	`pdoc = { "message" => "ohayo", join_field => parent_relation }`
`109`	`115`	`Manticore.put("#{index_url}/#{type}/#{parent_id}", {:body => pdoc.to_json, :headers => default_headers}).call`