More test fixes

Fixes #828

Author: robbavey

spec/integration/outputs/compressed_indexing_spec.rb

@@ -12,7 +12,7 @@
   describe "indexing with http_compression turned on", :integration => true do
     let(:event) { LogStash::Event.new("message" => "Hello World!", "type" => type) }
     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?("< 7") ? "doc" : "_doc" }
     let(:event_count) { 10000 + rand(500) }
     let(:events) { event_count.times.map { event }.to_a }
     let(:config) {
@@ -50,8 +50,6 @@
         result = LogStash::Json.load(response.body)
         result["hits"]["hits"].each do |doc|
           if ESHelper.es_version_satisfies?(">= 6")
-            expect(doc["_type"]).to eq(doc_type)
-          else
             expect(doc["_type"]).to eq(type)
           end
           expect(doc["_index"]).to eq(index)

spec/integration/outputs/index_spec.rb

@@ -12,7 +12,7 @@
       }
   }
   let(:index) { 10.times.collect { rand(10).to_s }.join("") }
-  let(:type) { ESHelper.es_version_satisfies?("<= 6.3") ? "doc" : "_doc" }
+  let(:type) { ESHelper.es_version_satisfies?("< 7") ? "doc" : "_doc" }
 
   subject { LogStash::Outputs::ElasticSearch.new(config) }
 
@@ -48,7 +48,7 @@
 describe "indexing" do
   let(:event) { LogStash::Event.new("message" => "Hello World!", "type" => type) }
   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?("< 7") ? "doc" : "_doc" }
   let(:event_count) { 1 + rand(2) }
   let(:config) { "not implemented" }
   let(:events) { event_count.times.map { event }.to_a }
@@ -80,8 +80,6 @@
       result = LogStash::Json.load(response.body)
       result["hits"]["hits"].each do |doc|
         if ESHelper.es_version_satisfies?(">= 6")
-          expect(doc["_type"]).to eq(doc_type)
-        else
           expect(doc["_type"]).to eq(type)
         end
         expect(doc["_index"]).to eq(index)
@@ -120,7 +118,7 @@
   end
 
   describe "an indexer with no type value set (default to doc)", :integration => true do
-    let(:type) { "doc" }
+    let(:type) { ESHelper.es_version_satisfies?("< 7") ? "doc" : "_doc" }
     let(:config) {
       {
         "hosts" => get_host_port,

spec/integration/outputs/parent_spec.rb

@@ -7,7 +7,7 @@
     shared_examples "a join field based parent indexer" do
       let(:index) { 10.times.collect { rand(10).to_s }.join("") }
 
-      let(:type) { ESHelper.es_version_satisfies?("<= 6.3") ? "doc" : "_doc" }
+      let(:type) { ESHelper.es_version_satisfies?("< 7") ? "doc" : "_doc" }
 
       let(:event_count) { 10000 + rand(500) }
       let(:parent) { "not_implemented" }