elastomer-client 3.2.3 → 6.2.0

data/test/client/docs_test.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative "../test_helper"
 
-describe Elastomer::Client::Docs do
+describe ElastomerClient::Client::Docs do
 
   before do
     @name  = "elastomer-docs-test"
@@ -8,27 +10,18 @@ describe Elastomer::Client::Docs do
 
     unless @index.exists?
       @index.create \
-        :settings => { "index.number_of_shards" => 1, "index.number_of_replicas" => 0 },
-        :mappings => {
-          :doc1 => {
-            :_source => { :enabled => true }, :_all => { :enabled => false },
-            :properties => {
-              :title  => $client.version_support.text(analyzer: "standard", term_vector: "with_positions_offsets"),
-              :author => $client.version_support.keyword
-            }
-          },
-          :doc2 => {
-            :_source => { :enabled => true }, :_all => { :enabled => false },
-            :properties => {
-              :title  => $client.version_support.text(analyzer: "standard", term_vector: "with_positions_offsets"),
-              :author => $client.version_support.keyword
-            }
+        settings: { "index.number_of_shards" => 1, "index.number_of_replicas" => 0 },
+        mappings: mappings_wrapper("book", {
+          _source: { enabled: true },
+          properties: {
+            title: { type: "text", analyzer: "standard", term_vector: "with_positions_offsets" },
+            author: { type: "keyword" }
           }
-        }
+        }, true)
 
       # COMPATIBILITY
-      if requires_percolator_mapping?
-        @index.update_mapping("percolator", { :properties => { :query => { :type => "percolator"}}})
+      if !$client.version_support.es_version_8_plus?
+        @index.update_mapping("percolator", { properties: { query: { type: "percolator"}}})
       end
 
       wait_for_index(@name)
@@ -42,56 +35,54 @@ describe Elastomer::Client::Docs do
   end
 
   it "raises error when writing same document twice" do
-    document = {
-      :_id => "documentid",
-      :_type => "doc2",
-      :_op_type => "create",
-      :title => "the author of logging",
-      :author => "pea53"
-    }
+    document = ({
+      _id: "documentid",
+      _type: "book",
+      _op_type: "create",
+      title: "Book by Author1",
+      author: "Author1"
+    })
     h = @docs.index document.dup
 
     assert_created h
 
-    assert_raises(Elastomer::Client::DocumentAlreadyExistsError) do
+    assert_raises(ElastomerClient::Client::DocumentAlreadyExistsError) do
       @docs.index document.dup
     end
   end
 
   it "autogenerates IDs for documents" do
-    h = @docs.index \
-          :_type  => "doc2",
-          :title  => "the author of logging",
-          :author => "pea53"
-
-    assert_created h
-    assert_match %r/^\S{20,22}$/, h["_id"]
-
-    h = @docs.index \
-          :_id    => nil,
-          :_type  => "doc3",
-          :title  => "the author of rubber-band",
-          :author => "grantr"
+    h = @docs.index(
+      {
+        _id: nil,
+        title: "Book1 by author 1",
+        author: "Author1",
+        _type: "book"
+      })
 
     assert_created h
     assert_match %r/^\S{20,22}$/, h["_id"]
 
-    h = @docs.index \
-          :_id    => "",
-          :_type  => "doc4",
-          :title  => "the author of toml",
-          :author => "mojombo"
+    h = @docs.index(
+      {
+        _id: nil,
+        title: "Book2 by author 2",
+        author: "Author2",
+        _type: "book"
+      })
 
     assert_created h
     assert_match %r/^\S{20,22}$/, h["_id"]
   end
 
   it "uses the provided document ID" do
-    h = @docs.index \
-          :_id    => "42",
-          :_type  => "doc2",
-          :title  => "the author of logging",
-          :author => "pea53"
+    h = @docs.index (
+      {
+        _id: 42,
+        _type: "book",
+        title: "Book1 by author 1",
+        author: "Author1"
+      })
 
     assert_created h
     assert_equal "42", h["_id"]
@@ -99,56 +90,66 @@ describe Elastomer::Client::Docs do
 
   it "accepts JSON encoded document strings" do
     h = @docs.index \
-          '{"author":"pea53", "title":"the author of logging"}',
-          :id   => "42",
-          :type => "doc2"
+      '{"author":"Author1", "title":"Book1 by author 1"}',
+      id: 42,
+      type: "book"
 
     assert_created h
     assert_equal "42", h["_id"]
-
-    h = @docs.index \
-          '{"author":"grantr", "title":"the author of rubber-band"}',
-          :type => "doc2"
-
-    assert_created h
-    assert_match %r/^\S{20,22}$/, h["_id"]
   end
 
   describe "indexing directive fields" do
+    before do
+      # Since we set dynamic: strict, adding the above doc to the index throws an error, so update the index to allow dynamic mapping
+      if !$client.version_support.es_version_8_plus?
+        @index.update_mapping "book", { book: { dynamic: "true" } }
+      end
+    end
+
+    after do
+      # Since we set dynamic: strict, adding the above doc to the index throws an error, so update the index to allow dynamic mapping
+      if !$client.version_support.es_version_8_plus?
+        @index.update_mapping "book", { book: { dynamic: "strict" } }
+      end
+    end
+
     it "indexes fields that are not recognized as indexing directives" do
-      doc = {
+      doc = ({
         _id: "12",
-        _type: "doc2",
-        title: "The Adventures of Huckleberry Finn",
-        author: "Mark Twain",
+        _type: "book",
+        title: "Book1",
+        author: "Author1",
         _unknown_1: "unknown attribute 1",
-        "_unknown_2" => "unknown attribute 2"
-      }
+        "_unknown_2": "unknown attribute 2"
+      })
 
       h = @docs.index(doc)
+
       assert_created h
       assert_equal "12", h["_id"]
 
-      indexed_doc = @docs.get(type: "doc2", id: "12")
+      indexed_doc = $client.version_support.es_version_8_plus? ? @docs.get(id: "12") : @docs.get(type: "book", id: "12")
       expected = {
-        "title" => "The Adventures of Huckleberry Finn",
-        "author" => "Mark Twain",
+        "title" => "Book1",
+        "author" => "Author1",
         "_unknown_1" => "unknown attribute 1",
         "_unknown_2" => "unknown attribute 2"
       }
+
       assert_equal expected, indexed_doc["_source"]
     end
 
     it "extracts indexing directives from the document" do
       doc = {
         _id: "12",
-        "_type" => "doc2",
+        _type: "book",
         _routing: "author",
-        title: "The Adventures of Huckleberry Finn",
-        author: "Mark Twain"
+        title: "Book1",
+        author: "Author1"
       }
 
       h = @docs.index(doc)
+
       assert_created h
       assert_equal "12", h["_id"]
 
@@ -157,78 +158,87 @@ describe Elastomer::Client::Docs do
       refute doc.key?("_type")
       refute doc.key?(:_routing)
 
-      indexed_doc = @docs.get(type: "doc2", id: "12")
+      indexed_doc = $client.version_support.es_version_8_plus? ? @docs.get(id: "12") : @docs.get(type: "book", id: "12")
       expected = {
-        "title" => "The Adventures of Huckleberry Finn",
-        "author" => "Mark Twain",
+        "title" => "Book1",
+        "author" => "Author1"
       }
+
       assert_equal expected, indexed_doc["_source"]
     end
 
-    # COMPATIBILITY: Fail fast on known indexing directives that aren't for this version of ES
     it "raises an exception when a known indexing directive from an unsupported version is used" do
       # Symbol keys
-      doc = {
+      doc = ({
         _id: "12",
-        _type: "doc2",
-        title: "The Adventures of Huckleberry Finn"
-      }.merge(incompatible_indexing_directive)
+        _type: "book",
+        title: "Book1",
+       _consistency: "all"
+      })
 
-      assert_raises(Elastomer::Client::IllegalArgument) do
+      assert_raises(ElastomerClient::Client::IllegalArgument) do
         @docs.index(doc)
       end
 
       # String keys
-      doc = {
+      doc = ({
         "_id" => "12",
-        "_type" => "doc2",
-        "title" => "The Adventures of Huckleberry Finn"
-      }.merge(incompatible_indexing_directive.stringify_keys)
+        "_type" => "book",
+        "title" => "Book1",
+        "_consistency" => "all"
+      })
 
-      assert_raises(Elastomer::Client::IllegalArgument) do
+      assert_raises(ElastomerClient::Client::IllegalArgument) do
         @docs.index(doc)
       end
     end
   end
 
   it "gets documents from the search index" do
-    h = @docs.get :id => "1", :type => "doc1"
+    h = $client.version_support.es_version_8_plus? ? @docs.get(id: "1") : @docs.get(id: "1", type: "book")
+
     refute_found h
 
     populate!
 
-    h = @docs.get :id => "1", :type => "doc1"
+    h = $client.version_support.es_version_8_plus? ? @docs.get(id: "1") : @docs.get(id: "1", type: "book")
+
     assert_found h
-    assert_equal "mojombo", h["_source"]["author"]
+    assert_equal "Author1", h["_source"]["author"]
   end
 
   it "checks if documents exist in the search index" do
-    refute @docs.exists?(:id => "1", :type => "doc1")
+    refute $client.version_support.es_version_8_plus? ? @docs.exists?(id: "1") : @docs.exists?(id: "1", type: "book")
     populate!
-    assert @docs.exists?(:id => "1", :type => "doc1")
+
+    assert $client.version_support.es_version_8_plus? ? @docs.exists?(id: "1") : @docs.exists?(id: "1", type: "book")
   end
 
   it "checks if documents exist in the search index with .exist?" do
-    refute @docs.exist?(:id => "1", :type => "doc1")
+    refute $client.version_support.es_version_8_plus? ? @docs.exist?(id: "1") : @docs.exist?(id: "1", type: "book")
     populate!
-    assert @docs.exist?(:id => "1", :type => "doc1")
+
+    assert $client.version_support.es_version_8_plus? ? @docs.exist?(id: "1") : @docs.exist?(id: "1", type: "book")
   end
 
   it "gets multiple documents from the search index" do
     populate!
 
-    h = @docs.multi_get :docs => [
-      { :_id => 1, :_type => "doc1" },
-      { :_id => 1, :_type => "doc2" }
+    h = @docs.multi_get docs: [
+      document_wrapper("book", { _id: 1 }),
+      document_wrapper("book", { _id: 2 })
     ]
     authors = h["docs"].map { |d| d["_source"]["author"] }
-    assert_equal %w[mojombo pea53], authors
 
-    h = @docs.multi_get({:ids => [2, 1]}, :type => "doc1")
+    assert_equal %w[Author1 Author2], authors
+
+    h = $client.version_support.es_version_8_plus? ? @docs.multi_get({ids: [2, 1]}) : @docs.multi_get({ids: [2, 1]}, type: "book")
     authors = h["docs"].map { |d| d["_source"]["author"] }
-    assert_equal %w[defunkt mojombo], authors
 
-    h = @index.docs("doc1").multi_get :ids => [1, 2, 3, 4]
+    assert_equal %w[Author2 Author1], authors
+
+    h = @index.docs("book").multi_get ids: [1, 2, 3, 4]
+
     assert_found h["docs"][0]
     assert_found h["docs"][1]
     refute_found h["docs"][2]
@@ -238,18 +248,21 @@ describe Elastomer::Client::Docs do
   it "gets multiple documents from the search index with .mget" do
     populate!
 
-    h = @docs.mget :docs => [
-      { :_id => 1, :_type => "doc1" },
-      { :_id => 1, :_type => "doc2" }
+    h = @docs.mget docs: [
+      document_wrapper("book", { _id: 1 }),
+      document_wrapper("book", { _id: 2 })
     ]
     authors = h["docs"].map { |d| d["_source"]["author"] }
-    assert_equal %w[mojombo pea53], authors
 
-    h = @docs.mget({:ids => [2, 1]}, :type => "doc1")
+    assert_equal %w[Author1 Author2], authors
+
+    h = @docs.mget({ids: [2, 1]})
     authors = h["docs"].map { |d| d["_source"]["author"] }
-    assert_equal %w[defunkt mojombo], authors
 
-    h = @index.docs("doc1").mget :ids => [1, 2, 3, 4]
+    assert_equal %w[Author2 Author1], authors
+
+    h = @index.docs("book").mget ids: [1, 2, 3, 4]
+
     assert_found h["docs"][0]
     assert_found h["docs"][1]
     refute_found h["docs"][2]
@@ -258,184 +271,246 @@ describe Elastomer::Client::Docs do
 
   it "deletes documents from the search index" do
     populate!
-    @docs = @index.docs("doc2")
+    @docs = @index.docs("book")
 
-    h = @docs.multi_get :ids => [1, 2]
+    h = @docs.multi_get ids: [1, 2]
     authors = h["docs"].map { |d| d["_source"]["author"] }
-    assert_equal %w[pea53 grantr], authors
 
-    h = @docs.delete :id => 1
-    assert h["found"], "expected document to be found"
-    h = @docs.multi_get :ids => [1, 2]
+    assert_equal %w[Author1 Author2], authors
+
+    h = @docs.delete id: 1
+
+    if $client.version_support.es_version_8_plus?
+      assert_equal "deleted", h["result"], "expected document to be found"
+    else
+      assert h["found"], "expected document to be found"
+    end
+
+    h = @docs.multi_get ids: [1, 2]
+
     refute_found h["docs"][0]
     assert_found h["docs"][1]
 
-    assert_raises(ArgumentError) { @docs.delete :id => nil }
-    assert_raises(ArgumentError) { @docs.delete :id => "" }
-    assert_raises(ArgumentError) { @docs.delete :id => "\t" }
+    assert_raises(ArgumentError) { @docs.delete id: nil }
+    assert_raises(ArgumentError) { @docs.delete id: "" }
+    assert_raises(ArgumentError) { @docs.delete id: "\t" }
   end
 
   it "does not care if you delete a document that is not there" do
-    @docs = @index.docs("doc2")
-    h = @docs.delete :id => 42
+    @docs = @index.docs("book")
+    h = @docs.delete id: 42
 
-    refute h["found"], "expected document to not be found"
+    if $client.version_support.es_version_8_plus?
+      refute_equal "deleted", h["result"], "expected document to not be found"
+    else
+      refute h["found"], "expected document to not be found"
+    end
   end
 
   it "deletes documents by query" do
     populate!
-    @docs = @index.docs("doc2")
+    @docs = @index.docs("book")
 
-    h = @docs.multi_get :ids => [1, 2]
+    h = @docs.multi_get ids: [1, 2]
     authors = h["docs"].map { |d| d["_source"]["author"] }
-    assert_equal %w[pea53 grantr], authors
 
-    h = @docs.delete_by_query(:q => "author:grantr")
+    assert_equal %w[Author1 Author2], authors
 
-    if supports_native_delete_by_query?
-      assert_equal(1, h["deleted"])
-    else
-      assert_equal(h["_indices"], {
-        "_all" => {
-          "found" => 1,
-          "deleted" => 1,
-          "missing" => 0,
-          "failed" => 0,
-        },
-        @name => {
-          "found" => 1,
-          "deleted" => 1,
-          "missing" => 0,
-          "failed" => 0,
-        },
-      })
-    end
+    h = @docs.delete_by_query(q: "author:Author2")
+
+    assert_equal(1, h["deleted"])
 
     @index.refresh
-    h = @docs.multi_get :ids => [1, 2]
+    h = @docs.multi_get ids: [1, 2]
+
     assert_found h["docs"][0]
     refute_found h["docs"][1]
 
     h = @docs.delete_by_query(
-      :query => {
-        :bool => {
-          :filter => {:term => {:author => "pea53"}}
+      query: {
+        bool: {
+          filter: {term: {author: "Author1"}}
         }
       }
     )
     @index.refresh
-    h = @docs.multi_get :ids => [1, 2]
+    h = @docs.multi_get ids: [1, 2]
+
     refute_found h["docs"][0]
     refute_found h["docs"][1]
   end
 
+  it "updates documents by query" do
+    populate!
+
+    r = @docs.update_by_query(query: {
+      bool: {
+        filter: {term: {author: "Author1"}}
+      }
+    }, script: {
+      source: "ctx._source.author = 'Author1 Updated'"
+    })
+
+    assert_equal 1, r["updated"]
+
+    r = @docs.update_by_query({
+      query: {
+        bool: {
+          filter: {term: {author: "Author2"}}
+        }
+      },
+      script: {
+        source: "ctx._source.author = 'Author2 Updated'"
+      }
+    }, conflicts: "proceed")
+
+    assert_equal 1, r["updated"]
+
+    @index.refresh
+
+    h = @docs.multi_get ids: [1, 2]
+
+    assert_equal "Author1 Updated", h["docs"][0]["_source"]["author"]
+    assert_equal "Author2 Updated", h["docs"][1]["_source"]["author"]
+
+  end
+
   it "searches for documents" do
-    h = @docs.search :q => "*:*"
-    assert_equal 0, h["hits"]["total"]
+    h = @docs.search q: "*:*"
+
+    if $client.version_support.es_version_8_plus?
+      assert_equal 0, h["hits"]["total"]["value"]
+    else
+      assert_equal 0, h["hits"]["total"]
+    end
 
     populate!
 
-    h = @docs.search :q => "*:*"
-    assert_equal 4, h["hits"]["total"]
+    h = @docs.search q: "*:*"
 
-    h = @docs.search :q => "*:*", :type => "doc1"
-    assert_equal 2, h["hits"]["total"]
+    if $client.version_support.es_version_8_plus?
+      assert_equal 2, h["hits"]["total"]["value"]
+    else
+      assert_equal 2, h["hits"]["total"]
+    end
+
+    if !$client.version_support.es_version_8_plus?
+      h = @docs.search q: "*:*", type: "book"
+
+      assert_equal 2, h["hits"]["total"]
+    end
 
     h = @docs.search({
-      :query => {:match_all => {}},
-      :post_filter => {:term => {:author => "defunkt"}}
-    }, :type => %w[doc1 doc2] )
-    assert_equal 1, h["hits"]["total"]
+      query: {match_all: {}},
+      post_filter: {term: {author: "Author1"}}
+    })
+
+    if $client.version_support.es_version_8_plus?
+      assert_equal 1, h["hits"]["total"]["value"]
+    else
+      assert_equal 1, h["hits"]["total"]
+    end
 
     hit = h["hits"]["hits"].first
-    assert_equal "the author of resque", hit["_source"]["title"]
+
+    assert_equal "Book1 by author 1", hit["_source"]["title"]
   end
 
   it "supports the shards search API" do
-    h = @docs.search_shards(:type => "docs1")
+    h = @docs.search_shards(params={})
 
     assert h.key?("nodes"), "response contains \"nodes\" information"
     assert h.key?("shards"), "response contains \"shards\" information"
-    assert h["shards"].is_a?(Array), "\"shards\" is an array"
+    assert_kind_of Array, h["shards"], "\"shards\" is an array"
   end
 
   it "generates QueryParsingError exceptions on bad input when searching" do
-    query = {:query => {:query_string => {:query => "OR should fail"}}}
-    assert_raises(Elastomer::Client::QueryParsingError) { @docs.search(query, :type => %w[doc1 doc2]) }
+    query = {query: {query_string: {query: "OR should fail"}}}
+    assert_raises(ElastomerClient::Client::QueryParsingError) { @docs.search(query) }
 
-    query = {:query => {:foo_is_not_valid => {}}}
-    assert_raises(Elastomer::Client::QueryParsingError) { @docs.search(query, :type => %w[doc1 doc2]) }
+    query = {query: {foo_is_not_valid: {}}}
+    assert_raises(ElastomerClient::Client::QueryParsingError) { @docs.search(query) }
   end
 
   it "counts documents" do
-    h = @docs.count :q => "*:*"
+    h = @docs.count q: "*:*"
+
     assert_equal 0, h["count"]
 
     populate!
 
-    h = @docs.count :q => "*:*"
-    assert_equal 4, h["count"]
+    h = @docs.count q: "*:*"
 
-    h = @docs.count :q => "*:*", :type => "doc1"
     assert_equal 2, h["count"]
 
-    h = @docs.count :q => "*:*", :type => "doc1,doc2"
-    assert_equal 4, h["count"]
+    if !$client.version_support.es_version_8_plus?
+      h = @docs.count(q: "*:*", type: "book")
+
+      assert_equal 2, h["count"]
+    end
 
     h = @docs.count({
-      :query => {
-        :bool => {
-          :filter => {:term => {:author => "defunkt"}}
+      query: {
+        bool: {
+          filter: {term: {author: "Author1"}}
         }
       }
-    }, :type => %w[doc1 doc2] )
+    })
+
     assert_equal 1, h["count"]
   end
 
   it "explains scoring" do
     populate!
 
-    h = @docs.explain({
-      :query => {
-        :match => {
-          "author" => "defunkt"
+    h = $client.version_support.es_version_8_plus? ?
+      @docs.explain({
+        query: {
+          match: {
+            "author" => "Author1"
+          }
         }
-      }
-    }, :type => "doc1", :id => 2)
-    assert_equal true, h["matched"]
+      }, id: 1)
+      : @docs.explain({
+        query: {
+          match: {
+            "author" => "Author1"
+          }
+        }
+      }, id: 1, type: "book")
 
-    h = @docs.explain(:type => "doc2", :id => 2, :q => "pea53")
-    assert_equal false, h["matched"]
+    assert h["matched"]
+
+    h = $client.version_support.es_version_8_plus? ? @docs.explain(id: 2, q: "Author1") : @docs.explain(type: "book", id: 2, q: "Author1")
+
+    refute h["matched"]
   end
 
   it "validates queries" do
     populate!
 
-    h = @docs.validate :q => "*:*"
-    assert_equal true, h["valid"]
+    h = @docs.validate q: "*:*"
+
+    assert h["valid"]
 
     h = @docs.validate({
-      :query => {
-        :filtered => {
-          :query => {:match_all => {}},
-          :filter => {:term => {:author => "defunkt"}}
+      query: {
+        filtered: {
+          query: {match_all: {}},
+          filter: {term: {author: "Author2"}}
         }
       }
-    }, :type => %w[doc1 doc2])
+    })
 
-    if filtered_query_removed?
-      refute h["valid"]
-    else
-      assert h["valid"]
-    end
+    refute h["valid"]
 
     h = @docs.validate({
-      :query => {
-        :bool => {
-          :filter => {:term => {:author => "defunkt"}}
+      query: {
+        bool: {
+          filter: {term: {author: "Author2"}}
         }
       }
-    }, :type => %w[doc1 doc2])
+    })
 
     assert h["valid"]
   end
@@ -443,97 +518,99 @@ describe Elastomer::Client::Docs do
   it "updates documents" do
     populate!
 
-    h = @docs.get :id => "1", :type => "doc1"
+    h = $client.version_support.es_version_8_plus? ? @docs.get(id: "1") : @docs.get(id: "1", type: "book")
+
     assert_found h
-    assert_equal "mojombo", h["_source"]["author"]
+    assert_equal "Author1", h["_source"]["author"]
+
+    @docs.update(document_wrapper("book", {
+      _id: "1",
+      doc: {author: "Author1.1"}
+    }))
+    h = $client.version_support.es_version_8_plus? ? @docs.get(id: "1") : @docs.get(id: "1", type: "book")
 
-    @docs.update({
-      :_id   => "1",
-      :_type => "doc1",
-      :doc   => {:author => "TwP"}
-    })
-    h = @docs.get :id => "1", :type => "doc1"
     assert_found h
-    assert_equal "TwP", h["_source"]["author"]
+    assert_equal "Author1.1", h["_source"]["author"]
 
     if $client.version >= "0.90"
-      @docs.update({
-        :_id   => "42",
-        :_type => "doc1",
-        :doc   => {
-          :author => "TwP",
-          :title  => "the ineffable beauty of search"
+      @docs.update(document_wrapper("book", {
+        _id: "42",
+        doc: {
+          author: "Author42",
+          title: "Book42"
         },
-        :doc_as_upsert => true
-      })
+        doc_as_upsert: true
+      }))
+
+      h = $client.version_support.es_version_8_plus? ? @docs.get(id: "42") : @docs.get(id: "42", type: "book")
 
-      h = @docs.get :id => "42", :type => "doc1"
       assert_found h
-      assert_equal "TwP", h["_source"]["author"]
-      assert_equal "the ineffable beauty of search", h["_source"]["title"]
+      assert_equal "Author42", h["_source"]["author"]
+      assert_equal "Book42", h["_source"]["title"]
     end
   end
 
   it "supports bulk operations with the same parameters as docs" do
     response = @docs.bulk do |b|
-      populate!(b)
+      populate_with_params!(b)
     end
 
     assert_kind_of Integer, response["took"]
 
-    response = @docs.get(:id => 1, :type => "doc1")
+    response = $client.version_support.es_version_8_plus? ? @docs.get(id: 1) : @docs.get(id: 1, type: "book")
+
     assert_found response
-    assert_equal "mojombo", response["_source"]["author"]
+    assert_equal "Author1", response["_source"]["author"]
   end
 
   it "provides access to term vector statistics" do
     populate!
 
-    response = @docs.termvector :type => "doc2", :id => 1, :fields => "title"
+    response = $client.version_support.es_version_8_plus? ? @docs.termvector(id: 1, fields: "title") : @docs.termvector(type: "book", id: 1, fields: "title")
 
     assert response["term_vectors"]["title"]
     assert response["term_vectors"]["title"]["field_statistics"]
     assert response["term_vectors"]["title"]["terms"]
-    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+    assert_equal %w[1 author book1 by], response["term_vectors"]["title"]["terms"].keys
   end
 
   it "provides access to term vector statistics with .termvectors" do
     populate!
 
-    response = @docs.termvectors :type => "doc2", :id => 1, :fields => "title"
+    response = $client.version_support.es_version_8_plus? ? @docs.termvectors(id: 1, fields: "title") : @docs.termvectors(type: "book", id: 1, fields: "title")
 
     assert response["term_vectors"]["title"]
     assert response["term_vectors"]["title"]["field_statistics"]
     assert response["term_vectors"]["title"]["terms"]
-    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+    assert_equal %w[1 author book1 by], response["term_vectors"]["title"]["terms"].keys
   end
 
   it "provides access to term vector statistics with .term_vector" do
     populate!
 
-    response = @docs.term_vector :type => "doc2", :id => 1, :fields => "title"
+    response = $client.version_support.es_version_8_plus? ? @docs.term_vector(id: 1, fields: "title") : @docs.term_vector(type: "book", id: 1, fields: "title")
 
     assert response["term_vectors"]["title"]
     assert response["term_vectors"]["title"]["field_statistics"]
     assert response["term_vectors"]["title"]["terms"]
-    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+    assert_equal %w[1 author book1 by], response["term_vectors"]["title"]["terms"].keys
   end
 
   it "provides access to term vector statistics with .term_vectors" do
     populate!
 
-    response = @docs.term_vectors :type => "doc2", :id => 1, :fields => "title"
+    response = $client.version_support.es_version_8_plus? ? @docs.term_vectors(id: 1, fields: "title") : @docs.term_vectors(type: "book", id: 1, fields: "title")
 
     assert response["term_vectors"]["title"]
     assert response["term_vectors"]["title"]["field_statistics"]
     assert response["term_vectors"]["title"]["terms"]
-    assert_equal %w[author logging of the], response["term_vectors"]["title"]["terms"].keys
+    assert_equal %w[1 author book1 by], response["term_vectors"]["title"]["terms"].keys
   end
 
   it "provides access to multi term vector statistics" do
     populate!
 
-    response = @docs.multi_termvectors({:ids => [1, 2]}, :type => "doc2", :fields => "title", :term_statistics => true)
+    response = $client.version_support.es_version_8_plus? ? @docs.multi_termvectors({ids: [1, 2]}, fields: "title", term_statistics: true) : @docs.multi_termvectors({ids: [1, 2]}, type: "book", fields: "title", term_statistics: true)
     docs = response["docs"]
 
     assert docs
@@ -543,7 +620,7 @@ describe Elastomer::Client::Docs do
   it "provides access to multi term vector statistics with .multi_term_vectors" do
     populate!
 
-    response = @docs.multi_term_vectors({:ids => [1, 2]}, :type => "doc2", :fields => "title", :term_statistics => true)
+    response = $client.version_support.es_version_8_plus? ? @docs.multi_term_vectors({ids: [1, 2]}, fields: "title", term_statistics: true) : @docs.multi_term_vectors({ids: [1, 2]}, type: "book", fields: "title", term_statistics: true)
     docs = response["docs"]
 
     assert docs
@@ -551,79 +628,112 @@ describe Elastomer::Client::Docs do
   end
 
   it "percolates a given document" do
+    if $client.version_support.es_version_8_plus?
+      skip "Percolate not supported in ES version #{$client.version}"
+    end
+
     populate!
 
     percolator1 = @index.percolator "1"
-    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    response = percolator1.create query: { match: { author: "Author1" } }
+
     assert response["created"], "Couldn't create the percolator query"
     percolator2 = @index.percolator "2"
-    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    response = percolator2.create query: { match: { author: "Author2" } }
+
     assert response["created"], "Couldn't create the percolator query"
     @index.refresh
 
-    response = @index.docs("doc1").percolate(:doc => { :author => "pea53" })
+    response = @index.docs("book").percolate(doc: { author: "Author1" })
+
     assert_equal 1, response["matches"].length
     assert_equal "1", response["matches"][0]["_id"]
   end
 
   it "percolates an existing document" do
+    if $client.version_support.es_version_8_plus?
+      skip "Percolate not supported in ES version #{$client.version}"
+    end
+
     populate!
 
     percolator1 = @index.percolator "1"
-    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    response = percolator1.create query: { match: { author: "Author1" } }
+
     assert response["created"], "Couldn't create the percolator query"
     percolator2 = @index.percolator "2"
-    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    response = percolator2.create query: { match: { author: "Author2" } }
+
     assert response["created"], "Couldn't create the percolator query"
     @index.refresh
 
-    response = @index.docs("doc2").percolate(nil, :id => "1")
+    response = @index.docs("book").percolate(nil, id: "1")
+
     assert_equal 1, response["matches"].length
     assert_equal "1", response["matches"][0]["_id"]
   end
 
   it "counts the matches for percolating a given document" do
+    if $client.version_support.es_version_8_plus?
+      skip "Percolate not supported in ES version #{$client.version}"
+    end
+
     populate!
 
     percolator1 = @index.percolator "1"
-    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    response = percolator1.create query: { match: { author: "Author1" } }
+
     assert response["created"], "Couldn't create the percolator query"
     percolator2 = @index.percolator "2"
-    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    response = percolator2.create query: { match: { author: "Author2" } }
+
     assert response["created"], "Couldn't create the percolator query"
     @index.refresh
 
-    count = @index.docs("doc1").percolate_count :doc => { :author => "pea53" }
+    count = @index.docs("book").percolate_count doc: { author: "Author1" }
+
     assert_equal 1, count
   end
 
   it "counts the matches for percolating an existing document" do
+    if $client.version_support.es_version_8_plus?
+      skip "Percolate not supported in ES version #{$client.version}"
+    end
+
     populate!
 
     percolator1 = @index.percolator "1"
-    response = percolator1.create :query => { :match => { :author => "pea53" } }
+    response = percolator1.create query: { match: { author: "Author1" } }
+
     assert response["created"], "Couldn't create the percolator query"
     percolator2 = @index.percolator "2"
-    response = percolator2.create :query => { :match => { :author => "defunkt" } }
+    response = percolator2.create query: { match: { author: "Author2" } }
+
     assert response["created"], "Couldn't create the percolator query"
     @index.refresh
 
-    count = @index.docs("doc2").percolate_count(nil, :id => "1")
+    count = @index.docs("book").percolate_count(nil, id: "1")
+
     assert_equal 1, count
   end
 
   it "performs multi percolate queries" do
-    @index.percolator("1").create :query => { :match_all => { } }
-    @index.percolator("2").create :query => { :match => { :author => "pea53" } }
+    if $client.version_support.es_version_8_plus?
+      skip "Multi percolate not supported in ES version #{$client.version}"
+    end
+
+    @index.percolator("1").create query: { match_all: { } }
+    @index.percolator("2").create query: { match: { author: "Author1" } }
     @index.refresh
 
-    h = @index.docs("doc2").multi_percolate do |m|
-      m.percolate :author => "pea53"
-      m.percolate :author => "grantr"
-      m.count({}, { :author => "grantr" })
+    h = @index.docs("book").multi_percolate do |m|
+      m.percolate author: "Author1"
+      m.percolate author: "Author2"
+      m.count({}, { author: "Author2" })
     end
 
     response1, response2, response3 = h["responses"]
+
     assert_equal ["1", "2"], response1["matches"].map { |match| match["_id"] }.sort
     assert_equal ["1"], response2["matches"].map { |match| match["_id"] }.sort
     assert_equal 1, response3["total"]
@@ -631,33 +741,36 @@ describe Elastomer::Client::Docs do
 
   # Create/index multiple documents.
   #
-  # docs - An instance of Elastomer::Client::Docs or Elastomer::Client::Bulk. If
+  # docs - An instance of ElastomerClient::Client::Docs or ElastomerClient::Client::Bulk. If
   #        nil uses the @docs instance variable.
-  # rubocop:disable Metrics/MethodLength
   def populate!(docs = @docs)
-    docs.index \
-      :_id    => 1,
-      :_type  => "doc1",
-      :title  => "the author of gravatar",
-      :author => "mojombo"
-
-    docs.index \
-      :_id    => 2,
-      :_type  => "doc1",
-      :title  => "the author of resque",
-      :author => "defunkt"
-
-    docs.index \
-      :_id    => 1,
-      :_type  => "doc2",
-      :title  => "the author of logging",
-      :author => "pea53"
-
-    docs.index \
-      :_id    => 2,
-      :_type  => "doc2",
-      :title  => "the author of rubber-band",
-      :author => "grantr"
+    docs.index ({
+        _id: 1,
+        _type: "book",
+        title: "Book1 by author 1",
+        author: "Author1"
+      })
+
+    docs.index ({
+        _id: 2,
+        _type: "book",
+        title: "Book2 by author 2",
+        author: "Author2"
+      })
+
+    @index.refresh
+  end
+
+  def populate_with_params!(docs = @docs)
+    docs.index({
+        title: "Book1 by author 1",
+        author: "Author1"
+      }, { _id: 1, _type: "book" })
+
+    docs.index({
+        title: "Book2 by author 2",
+        author: "Author2"
+      }, { _id: 2, _type: "book" })
 
     @index.refresh
   end