[API] Updates specs

Author: picandocodigo

elasticsearch-api/spec/unit/actions/clear_scroll_spec.rb

@@ -18,37 +18,18 @@
 require 'spec_helper'
 
 describe 'client#clear_scroll' do
-
   let(:expected_args) do
     [
       'DELETE',
-      '_search/scroll/abc123',
+      '_search/scroll',
       {},
-      nil,
+      { scroll_id: 123 },
       {},
-      { defined_params: { scroll_id: 'abc123' }, endpoint: 'clear_scroll' }
+      { endpoint: 'clear_scroll' }
     ]
   end
 
   it 'performs the request' do
-    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
-
-    let(:expected_args) do
-      [
-          'DELETE',
-          '_search/scroll/abc123,def456',
-          {},
-          nil,
-          {},
-          { defined_params: { scroll_id: ['abc123', 'def456'] }, endpoint: 'clear_scroll' }
-      ]
-    end
-
-    it 'performs the request' do
-      expect(client_double.clear_scroll(scroll_id: ['abc123', 'def456'])).to be_a Elasticsearch::API::Response
-    end
+    expect(client_double.clear_scroll(body: { scroll_id: 123 })).to be_a Elasticsearch::API::Response
   end
 end

elasticsearch-api/spec/unit/actions/cluster/reroute_spec.rb

@@ -21,12 +21,12 @@
 
   let(:expected_args) do
     [
-        'POST',
-        '_cluster/reroute',
-        {},
-        {},
-        {},
-        { endpoint: 'cluster.reroute' }
+      'POST',
+      '_cluster/reroute',
+      {},
+      nil,
+      {},
+      { endpoint: 'cluster.reroute' }
     ]
   end
 
@@ -35,15 +35,14 @@
   end
 
   context 'when a body is specified' do
-
     let(:expected_args) do
       [
-          'POST',
-          '_cluster/reroute',
-          {},
-          { commands: [ move: { index: 'myindex', shard: 0 }] },
-          {},
-          { endpoint: 'cluster.reroute' }
+        'POST',
+        '_cluster/reroute',
+        {},
+        { commands: [ move: { index: 'myindex', shard: 0 }] },
+        {},
+        { endpoint: 'cluster.reroute' }
       ]
     end
 

elasticsearch-api/spec/unit/actions/indices/get_field_mapping_spec.rb

@@ -26,7 +26,7 @@
         {},
         nil,
         {},
-        { endpoint: 'indices.get_field_mapping' }
+        { endpoint: 'indices.get_field_mapping', defined_params: { fields: 'foo' } }
     ]
   end
 
@@ -35,11 +35,10 @@
   end
 
   it 'performs the request' do
-    expect(client_double.indices.get_field_mapping(field: 'foo')).to be_a Elasticsearch::API::Response
+    expect(client_double.indices.get_field_mapping(fields: 'foo')).to be_a Elasticsearch::API::Response
   end
 
   context 'when an index is specified' do
-
     let(:url) do
       'foo/_mapping/field/bam'
     end
@@ -51,12 +50,12 @@
         {},
         nil,
         {},
-        { defined_params: { index: 'foo' }, endpoint: 'indices.get_field_mapping' }
+        { defined_params: { index: 'foo', fields: 'bam' }, endpoint: 'indices.get_field_mapping' }
       ]
     end
 
     it 'performs the request' do
-      expect(client_double.indices.get_field_mapping(index: 'foo', field: 'bam')).to be_a Elasticsearch::API::Response
+      expect(client_double.indices.get_field_mapping(index: 'foo', fields: 'bam')).to be_a Elasticsearch::API::Response
     end
   end
 end

elasticsearch-api/spec/unit/actions/ingest/get_ip_location_database_spec.rb

@@ -22,7 +22,7 @@
     [
       'GET',
       '_ingest/ip_location/database/foo',
-      {},
+      { body: {} },
       nil,
       {},
       { defined_params: { id: 'foo' }, endpoint: 'ingest.get_ip_location_database' }

elasticsearch-api/spec/unit/actions/mtermvectors_spec.rb

@@ -18,26 +18,35 @@
 require 'spec_helper'
 
 describe 'client#mtermvectors' do
-  let(:expected_args) do
-    [
-      'POST',
-      'my-index/_mtermvectors',
-      {},
-      body,
-      {},
-      { defined_params: { index: 'my-index' }, endpoint: 'mtermvectors' }
-    ]
-  end
-
-  let(:body) do
-    { ids: [1, 2, 3] }
-  end
+  context 'in body' do
+    let(:expected_args) do
+      [
+        'POST',
+        'my-index/_mtermvectors',
+        {},
+        { ids: [1, 2, 3] },
+        {},
+        { defined_params: { index: 'my-index' }, endpoint: 'mtermvectors' }
+      ]
+    end
 
-  it 'performs the request' do
-    expect(client_double.mtermvectors(index: 'my-index', body: { ids: [1, 2, 3] })).to be_a Elasticsearch::API::Response
+    it 'performs the request' do
+      expect(client_double.mtermvectors(index: 'my-index', body: { ids: [1, 2, 3] })).to be_a Elasticsearch::API::Response
+    end
   end
 
   context 'when a list of ids is passed instead of a body' do
+    let(:expected_args) do
+      [
+        'GET',
+        'my-index/_mtermvectors',
+        { ids: '1,2,3' },
+        nil,
+        {},
+        { defined_params: { index: 'my-index' }, endpoint: 'mtermvectors' }
+      ]
+    end
+
     it 'performs the request' do
       expect(client_double.mtermvectors(index: 'my-index', ids: [1, 2, 3])).to be_a Elasticsearch::API::Response
     end

elasticsearch-api/spec/unit/actions/scroll_spec.rb

@@ -22,11 +22,11 @@
     let(:expected_args) do
       [
         'GET',
-        '_search/scroll/cXVlcn...',
+        '_search/scroll',
         {},
         nil,
         {},
-        { defined_params: { scroll_id: 'cXVlcn...' }, endpoint: 'scroll' }
+        { endpoint: 'scroll' }
       ]
     end
 

elasticsearch-api/spec/unit/perform_request_spec.rb

@@ -23,7 +23,11 @@
 describe 'Perform request args' do
   Elasticsearch::API::FilesHelper.files.each do |filepath|
     spec = Elasticsearch::API::EndpointSpec.new(filepath)
-    next if spec.module_namespace.flatten.first == '_internal' || spec.visibility != 'public'
+    next if spec.module_namespace.flatten.first == '_internal' ||
+            spec.visibility != 'public' ||
+            # TODO: Once the test suite is migrated to elasticsearch-specification, these should be removed
+            spec.module_namespace.flatten.first == 'rollup' ||
+            ['scroll', 'clear_scroll', 'connector.last_sync'].include?(spec.endpoint_name)
 
     # These are the path parts defined by the user in the method argument
     defined_path_parts = spec.path_params.inject({}) do |params, part|