Fix tests for 7.x after type removal

Fixes #826

Author: robbavey

spec/es_spec_helper.rb

@@ -32,11 +32,15 @@ def todays_date
 
   def mapping_name
     if ESHelper.es_version_satisfies?(">=7")
-      "_doc"
+      nil
     else
       "_default_"
     end
+  end
 
+  def field_properties_from_template(template_name, field)
+    mappings = @es.indices.get_template(name: template_name)[template_name]["mappings"]
+    (mapping_name.nil?) ? mappings["properties"][field]["properties"] : mappings[mapping_name]["properties"][field]["properties"]
   end
 
   def routing_field_name

spec/integration/outputs/parent_spec.rb

@@ -76,7 +76,15 @@
 
     shared_examples "a join field based parent indexer" do
       let(:index) { 10.times.collect { rand(10).to_s }.join("") }
-      let(:type) { 10.times.collect { rand(10).to_s }.join("") }
+
+      let(:type) do
+        if ESHelper.es_version_satisfies?('<7')
+          10.times.collect { rand(10).to_s }.join("")
+        else
+          "_doc"
+        end
+      end
+
       let(:event_count) { 10000 + rand(500) }
       let(:parent) { "not_implemented" }
       let(:config) { "not_implemented" }

spec/integration/outputs/templates_5x_spec.rb

@@ -82,7 +82,7 @@
     end
 
     it "make [geoip][location] a geo_point" do
-      expect(@es.indices.get_template(name: "logstash")["logstash"]["mappings"][mapping_name]["properties"]["geoip"]["properties"]["location"]["type"]).to eq("geo_point")
+      expect(field_properties_from_template("logstash", "geoip")["location"]["type"]).to eq("geo_point")
     end
 
     it "aggregate .keyword results correctly " do