elasticsearch-api 7.15.0 → 8.0.0.pre1

data/lib/elasticsearch/api/response.rb

@@ -0,0 +1,48 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+module Elasticsearch
+  module API
+    # Elasticsearch client API Response object. Receives an Elastic::Transport::Transport::Response in
+    # the initializer and behaves like a Hash, except when status or headers are called upon it, in
+    # which case it returns the original object's status and headers.
+    class Response
+      RESPONSE_METHODS = [:status, :body, :headers]
+
+      def initialize(response)
+        @response = response
+      end
+
+      def method_missing(method, *args, &block)
+        if RESPONSE_METHODS.include? method
+          @response.send method.to_sym
+        else
+          @response.body.send(method.to_sym, *args, &block)
+        end
+      end
+
+      def respond_to_missing?(method_name, include_private = false)
+        @response.body.respond_to?(method_name, include_private) ||
+          RESPONSE_METHODS.include?(method_name)
+      end
+
+      def to_s
+        @response.body.to_s
+      end
+    end
+  end
+end

data/lib/elasticsearch/api/utils.rb

@@ -130,54 +130,9 @@ module Elasticsearch
         payload = payload.join("\n")
       end
 
-      # Validates the argument Hash against common and valid API parameters
-      #
-      # @param arguments    [Hash]          Hash of arguments to verify and extract, **with symbolized keys**
-      # @param valid_params [Array<Symbol>] An array of symbols with valid keys
-      #
-      # @return [Hash]         Return whitelisted Hash
-      # @raise [ArgumentError] If the arguments Hash contains invalid keys
-      #
-      # @example Extract parameters
-      #   __validate_and_extract_params( { :foo => 'qux' }, [:foo, :bar] )
-      #   # => { :foo => 'qux' }
-      #
-      # @example Raise an exception for invalid parameters
-      #   __validate_and_extract_params( { :foo => 'qux', :bam => 'mux' }, [:foo, :bar] )
-      #   # ArgumentError: "URL parameter 'bam' is not supported"
-      #
-      # @example Skip validating parameters
-      #   __validate_and_extract_params( { :foo => 'q', :bam => 'm' }, [:foo, :bar], { skip_parameter_validation: true } )
-      #   # => { :foo => "q", :bam => "m" }
-      #
-      # @example Skip validating parameters when the module setting is set
-      #   Elasticsearch::API.settings[:skip_parameter_validation] = true
-      #   __validate_and_extract_params( { :foo => 'q', :bam => 'm' }, [:foo, :bar] )
-      #   # => { :foo => "q", :bam => "m" }
-      #
-      # @api private
-      #
-      def __validate_and_extract_params(arguments, params=[], options={})
-        if options[:skip_parameter_validation] || Elasticsearch::API.settings[:skip_parameter_validation]
-          arguments
-        else
-          __validate_params(arguments, params)
-          __extract_params(arguments, params, options.merge(:escape => false))
-        end
-      end
-
-      def __validate_params(arguments, valid_params=[])
-        arguments.each do |k,v|
-          raise ArgumentError, "URL parameter '#{k}' is not supported" \
-            unless COMMON_PARAMS.include?(k) || COMMON_QUERY_PARAMS.include?(k) || valid_params.include?(k)
-        end
-      end
-
-      def __extract_params(arguments, params=[], options={})
-        result = arguments.select { |k,v| COMMON_QUERY_PARAMS.include?(k) || params.include?(k) }
-        result = Hash[result] unless result.is_a?(Hash) # Normalize Ruby 1.8 and Ruby 1.9 Hash#select behaviour
-        result = Hash[result.map { |k,v| v.is_a?(Array) ? [k, __listify(v, options)] : [k,v]  }] # Listify Arrays
-        result
+      def process_params(arguments)
+        arguments = Hash[arguments] unless arguments.is_a?(Hash)
+        Hash[arguments.map { |k, v| v.is_a?(Array) ? [k, __listify(v, { escape: false })] : [k, v] }] # Listify Arrays
       end
 
       # Extracts the valid parts of the URL from the arguments
@@ -197,11 +152,7 @@ module Elasticsearch
       # @api private
       #
       def __extract_parts(arguments, valid_parts=[])
-        parts = Hash[arguments.select { |k,v| valid_parts.include?(k) }]
-        parts = parts.reduce([]) { |sum, item| k, v = item; v.is_a?(TrueClass) ? sum << k.to_s : sum << v  }
-
-        arguments.delete_if { |k,v| valid_parts.include? k }
-        return parts
+        Hash[arguments].reduce([]) { |sum, item| k, v = item; v.is_a?(TrueClass) ? sum << k.to_s : sum << v  }
       end
 
       # Calls the given block, rescuing from `StandardError`.

data/lib/elasticsearch/api/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module API
-    VERSION = '7.15.0'.freeze
+    VERSION = '8.0.0.pre1'.freeze
   end
 end

data/lib/elasticsearch/api.rb

@@ -21,9 +21,8 @@ require "multi_json"
 require "elasticsearch/api/version"
 require "elasticsearch/api/namespace/common"
 require "elasticsearch/api/utils"
-require "elasticsearch/api/actions/params_registry"
+require 'elasticsearch/api/response'
 
-Dir[ File.expand_path('../api/actions/**/params_registry.rb', __FILE__) ].each   { |f| require f }
 Dir[ File.expand_path('../api/actions/**/*.rb', __FILE__) ].each   { |f| require f }
 Dir[ File.expand_path('../api/namespace/**/*.rb', __FILE__) ].each { |f| require f }
 
@@ -31,24 +30,6 @@ module Elasticsearch
   module API
     DEFAULT_SERIALIZER = MultiJson
 
-    COMMON_PARAMS = [
-      :ignore,                        # Client specific parameters
-      :index, :type, :id,             # :index/:type/:id
-      :body,                          # Request body
-      :node_id,                       # Cluster
-      :name,                          # Alias, template, settings, warmer, ...
-      :field                          # Get field mapping
-    ]
-
-    COMMON_QUERY_PARAMS = [
-      :ignore,                        # Client specific parameters
-      :format,                        # Search, Cat, ...
-      :pretty,                        # Pretty-print the response
-      :human,                         # Return numeric values in human readable format
-      :filter_path,                   # Filter the JSON response
-      :opaque_id                      # Use X-Opaque-Id
-    ]
-
     HTTP_GET          = 'GET'.freeze
     HTTP_HEAD         = 'HEAD'.freeze
     HTTP_POST         = 'POST'.freeze
@@ -74,7 +55,31 @@ module Elasticsearch
                 Elasticsearch::API::Remote,
                 Elasticsearch::API::DanglingIndices,
                 Elasticsearch::API::Features,
-                Elasticsearch::API::Shutdown
+                Elasticsearch::API::Shutdown,
+                Elasticsearch::API::AsyncSearch,
+                Elasticsearch::API::Autoscaling,
+                Elasticsearch::API::CrossClusterReplication,
+                Elasticsearch::API::DataFrameTransformDeprecated,
+                Elasticsearch::API::Enrich,
+                Elasticsearch::API::Eql,
+                Elasticsearch::API::Fleet,
+                Elasticsearch::API::Graph,
+                Elasticsearch::API::IndexLifecycleManagement,
+                Elasticsearch::API::License,
+                Elasticsearch::API::Logstash,
+                Elasticsearch::API::Migration,
+                Elasticsearch::API::MachineLearning,
+                Elasticsearch::API::Monitoring,
+                Elasticsearch::API::Rollup,
+                Elasticsearch::API::SearchableSnapshots,
+                Elasticsearch::API::Security,
+                Elasticsearch::API::SnapshotLifecycleManagement,
+                Elasticsearch::API::SQL,
+                Elasticsearch::API::SSL,
+                Elasticsearch::API::TextStructure,
+                Elasticsearch::API::Transform,
+                Elasticsearch::API::Watcher,
+                Elasticsearch::API::XPack
     end
 
     # The serializer class

data/spec/elasticsearch/api/actions/bulk_spec.rb

@@ -54,7 +54,7 @@ describe 'client#bulk' do
           { :update => { :_index => 'myindexB', :_type => 'mytype', :_id => '2', :data => { :doc => { :title => 'Update' } } } },
           { :delete => { :_index => 'myindexC', :_type => 'mytypeC', :_id => '3' } },
           { :index =>  { :_index => 'myindexD', :_type => 'mytype', :_id => '1', :data => { :data => 'MYDATA' } } },
-      ])).to eq({})
+      ])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -63,7 +63,7 @@ describe 'client#bulk' do
     let(:url) { 'myindex/_bulk' }
 
     it 'performs the request' do
-      expect(client_double.bulk(index: 'myindex', body: [])).to eq({})
+      expect(client_double.bulk(index: 'myindex', body: [])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -78,7 +78,7 @@ describe 'client#bulk' do
 
     it 'performs the request' do
       expect(client_double.bulk(body:[ { :update => { :_index => 'myindex', :_type => 'mytype', :_id => '1' } },
-                                       { :doc => { :data => { :title => 'Update' } } } ])).to eq({})
+                                       { :doc => { :data => { :title => 'Update' } } } ])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -89,7 +89,7 @@ describe 'client#bulk' do
     end
 
     it 'performs the request' do
-      expect(client_double.bulk(body: 'foo\nbar')).to eq({})
+      expect(client_double.bulk(body: 'foo\nbar')).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -100,7 +100,7 @@ describe 'client#bulk' do
     end
 
     it 'performs the request' do
-      expect(client_double.bulk(body: ['foo', 'bar'])).to eq({})
+      expect(client_double.bulk(body: ['foo', 'bar'])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -111,7 +111,7 @@ describe 'client#bulk' do
     end
 
     it 'performs the request' do
-      expect(client_double.bulk(refresh: true, body: [])).to eq({})
+      expect(client_double.bulk(refresh: true, body: [])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -122,7 +122,7 @@ describe 'client#bulk' do
     end
 
     it 'performs the request' do
-      expect(client_double.bulk(index: 'foo^bar', body: [])).to eq({})
+      expect(client_double.bulk(index: 'foo^bar', body: [])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -133,7 +133,7 @@ describe 'client#bulk' do
     end
 
     it 'performs the request' do
-      expect(client_double.bulk(index: 'myindex', type: 'mytype', body: [])).to eq({})
+      expect(client_double.bulk(index: 'myindex', type: 'mytype', body: [])).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/cat/aliases_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#aliases' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.aliases).to eq({})
+    expect(client_double.cat.aliases).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/allocation_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#allocation' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.allocation).to eq({})
+    expect(client_double.cat.allocation).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/count_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#count' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.count).to eq({})
+    expect(client_double.cat.count).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/fielddata_spec.rb

@@ -30,7 +30,7 @@ describe 'client.cat#fielddata' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.fielddata).to eq({})
+    expect(client_double.cat.fielddata).to be_a Elasticsearch::API::Response
   end
 
   context 'when field are specified' do
@@ -46,7 +46,7 @@ describe 'client.cat#fielddata' do
     end
 
     it 'performs the request' do
-      expect(client_double.cat.fielddata(fields: ['foo', 'bar'])).to eq({})
+      expect(client_double.cat.fielddata(fields: ['foo', 'bar'])).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/cat/health_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#health' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.health).to eq({})
+    expect(client_double.cat.health).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/help_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#help' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.help).to eq({})
+    expect(client_double.cat.help).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/indices_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#indices' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.indices).to eq({})
+    expect(client_double.cat.indices).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/master_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#master' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.master).to eq({})
+    expect(client_double.cat.master).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/nodeattrs_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#nodeattrs' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.nodeattrs).to eq({})
+    expect(client_double.cat.nodeattrs).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/nodes_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#nodes' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.nodes).to eq({})
+    expect(client_double.cat.nodes).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/pending_tasks_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#pending_tasks' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.pending_tasks).to eq({})
+    expect(client_double.cat.pending_tasks).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/plugins_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#plugins' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.plugins).to eq({})
+    expect(client_double.cat.plugins).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/recovery_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#recovery' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.recovery).to eq({})
+    expect(client_double.cat.recovery).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/repositories_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#repositories' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.repositories).to eq({})
+    expect(client_double.cat.repositories).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/segments_spec.rb

@@ -34,7 +34,7 @@ describe 'client.cat#segments' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.segments).to eq({})
+    expect(client_double.cat.segments).to be_a Elasticsearch::API::Response
   end
 
   context 'when index is specified' do
@@ -43,7 +43,7 @@ describe 'client.cat#segments' do
     end
 
     it 'performs the request' do
-      expect(client_double.cat.segments(index: 'foo')).to eq({})
+      expect(client_double.cat.segments(index: 'foo')).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/cat/shards_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#shards' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.shards).to eq({})
+    expect(client_double.cat.shards).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/snapshot_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#snapshots' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.snapshots(repository: 'foo')).to eq({})
+    expect(client_double.cat.snapshots(repository: 'foo')).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/tasks_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#tasks' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.tasks).to eq({})
+    expect(client_double.cat.tasks).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/templates_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#templates' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.templates).to eq({})
+    expect(client_double.cat.templates).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cat/thread_pool_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cat#thread_pool' do
   end
 
   it 'performs the request' do
-    expect(client_double.cat.thread_pool).to eq({})
+    expect(client_double.cat.thread_pool).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/clear_scroll_spec.rb

@@ -30,7 +30,7 @@ describe 'client#clear_scroll' do
   end
 
   it 'performs the request' do
-    expect(client_double.clear_scroll(scroll_id: 'abc123')).to eq({})
+    expect(client_double.clear_scroll(scroll_id: 'abc123')).to be_a Elasticsearch::API::Response
   end
 
   context 'when a list of scroll ids is provided' do
@@ -46,7 +46,7 @@ describe 'client#clear_scroll' do
     end
 
     it 'performs the request' do
-      expect(client_double.clear_scroll(scroll_id: ['abc123', 'def456'])).to eq({})
+      expect(client_double.clear_scroll(scroll_id: ['abc123', 'def456'])).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/close_point_in_time_spec.rb

@@ -29,6 +29,6 @@ describe 'client#close_point_in_time' do
   end
 
   it 'performs the request' do
-    expect(client_double.close_point_in_time).to eq({})
+    expect(client_double.close_point_in_time).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cluster/allocation_explain_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cluster#allocation_explain' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.allocation_explain).to eq({})
+    expect(client_double.cluster.allocation_explain).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cluster/get_settings_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cluster#get_settings' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.get_settings).to eq({})
+    expect(client_double.cluster.get_settings).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cluster/health_spec.rb

@@ -30,7 +30,7 @@ describe 'client.cluster#health' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.health).to eq({})
+    expect(client_double.cluster.health).to be_a Elasticsearch::API::Response
   end
 
   context 'when a level is specified' do
@@ -46,7 +46,7 @@ describe 'client.cluster#health' do
     end
 
     it 'performs the request' do
-      expect(client_double.cluster.health(level: 'indices')).to eq({})
+      expect(client_double.cluster.health(level: 'indices')).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -63,7 +63,7 @@ describe 'client.cluster#health' do
     end
 
     it 'performs the request' do
-      expect(client_double.cluster.health(index: 'foo')).to eq({})
+      expect(client_double.cluster.health(index: 'foo')).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/cluster/pending_tasks_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cluster#pending_tasks' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.pending_tasks).to eq({})
+    expect(client_double.cluster.pending_tasks).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cluster/put_settings_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cluster#put_settings' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.put_settings(body: {})).to eq({})
+    expect(client_double.cluster.put_settings(body: {})).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cluster/remote_info_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cluster#remote_info' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.remote_info).to eq({})
+    expect(client_double.cluster.remote_info).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/cluster/reroute_spec.rb

@@ -30,7 +30,7 @@ describe 'client.cluster#reroute' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.reroute).to eq({})
+    expect(client_double.cluster.reroute).to be_a Elasticsearch::API::Response
   end
 
   context 'when a body is specified' do
@@ -46,7 +46,7 @@ describe 'client.cluster#reroute' do
     end
 
     it 'performs the request' do
-      expect(client_double.cluster.reroute(body: { commands: [ move: { index: 'myindex', shard: 0 }] })).to eq({})
+      expect(client_double.cluster.reroute(body: { commands: [ move: { index: 'myindex', shard: 0 }] })).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/cluster/state_spec.rb

@@ -30,7 +30,7 @@ describe 'client.cluster#state' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.state).to eq({})
+    expect(client_double.cluster.state).to be_a Elasticsearch::API::Response
   end
 
   context 'when a metric is specified' do
@@ -46,7 +46,7 @@ describe 'client.cluster#state' do
     end
 
     it 'performs the request' do
-      expect(client_double.cluster.state(metric: ['foo', 'bar'])).to eq({})
+      expect(client_double.cluster.state(metric: ['foo', 'bar'])).to be_a Elasticsearch::API::Response
     end
   end
 end

data/spec/elasticsearch/api/actions/cluster/stats_spec.rb

@@ -30,6 +30,6 @@ describe 'client.cluster#stats' do
   end
 
   it 'performs the request' do
-    expect(client_double.cluster.stats).to eq({})
+    expect(client_double.cluster.stats).to be_a Elasticsearch::API::Response
   end
 end

data/spec/elasticsearch/api/actions/count_spec.rb

@@ -30,7 +30,7 @@ describe 'client#count' do
   end
 
   it 'performs the request' do
-    expect(client_double.count).to eq({})
+    expect(client_double.count).to be_a Elasticsearch::API::Response
   end
 
   context 'when an index and type are specified' do
@@ -38,7 +38,7 @@ describe 'client#count' do
     let(:expected_args) do
       [
         'POST',
-        'foo,bar/t1,t2/_count',
+        'foo,bar/_count',
         {},
         nil,
         {}
@@ -46,7 +46,7 @@ describe 'client#count' do
     end
 
     it 'performs the request' do
-      expect(client_double.count(index: ['foo','bar'], type: ['t1','t2'])).to eq({})
+      expect(client_double.count(index: ['foo','bar'])).to be_a Elasticsearch::API::Response
     end
   end
 
@@ -63,7 +63,7 @@ describe 'client#count' do
     end
 
     it 'performs the request' do
-      expect(client_double.count(body: { match: { foo: 'bar' } })).to eq({})
+      expect(client_double.count(body: { match: { foo: 'bar' } })).to be_a Elasticsearch::API::Response
     end
   end
 end