Continue fixing tests

Correct type logic for join field based parent indexer tests
Remove 'bad type' tests that can no longer be exercised due to removal
 of custom type code

Fixes #828

Author: robbavey

spec/integration/outputs/index_spec.rb

@@ -12,7 +12,8 @@
       }
   }
   let(:index) { 10.times.collect { rand(10).to_s }.join("") }
-  let(:type) { 10.times.collect { rand(10).to_s }.join("") }
+  let(:type) { ESHelper.es_version_satisfies?("<= 6.3") ? "doc" : "_doc" }
+
   subject { LogStash::Outputs::ElasticSearch.new(config) }
 
   before do

spec/integration/outputs/parent_spec.rb

@@ -7,13 +7,7 @@
     shared_examples "a join field based parent indexer" do
       let(:index) { 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(:type) { ESHelper.es_version_satisfies?("<= 6.3") ? "doc" : "_doc" }
 
       let(:event_count) { 10000 + rand(500) }
       let(:parent) { "not_implemented" }

spec/unit/outputs/elasticsearch_spec.rb

@@ -63,25 +63,6 @@
           expect(subject.send(:get_event_type, LogStash::Event.new("type" => "foo"))).to eql("doc")
         end
       end
-
-      context "with a bad type event field in a < 6.0 es cluster" do
-        let(:maximum_seen_major_version) { 5 }
-        let(:type_arg) { ["foo"] }
-        let(:result) { subject.send(:get_event_type, LogStash::Event.new("type" => type_arg)) }
-
-        before do
-          allow(subject.instance_variable_get(:@logger)).to receive(:warn)
-          result
-        end
-
-        it "should call @logger.warn and return nil" do
-          expect(subject.instance_variable_get(:@logger)).to have_received(:warn).with(/Bad event type!/, anything).once
-        end
-
-        it "should set the type to the stringified value" do
-          expect(result).to eql(type_arg.to_s)
-        end
-      end
     end
 
     describe "with auth" do