elasticsearch-api 7.3.0 → 7.5.0

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

@@ -8,16 +8,16 @@ describe 'client.cat#segments' do
 
   let(:expected_args) do
     [
-        'GET',
-        '_cat/segments',
-        params,
-        nil,
-        nil
+      'GET',
+      url,
+      {},
+      nil,
+      nil
     ]
   end
 
-  let(:params) do
-    {}
+  let(:url) do
+    '_cat/segments'
   end
 
   it 'performs the request' do
@@ -25,10 +25,8 @@ describe 'client.cat#segments' do
   end
 
   context 'when index is specified' do
-
-
-    let(:params) do
-      { index: 'foo' }
+    let(:url) do
+      '_cat/segments/foo'
     end
 
     it 'performs the request' do

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

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

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

@@ -23,10 +23,10 @@ describe 'client#count' do
 
     let(:expected_args) do
       [
-          'GET',
-          'foo,bar/t1,t2/_count',
-          {},
-          nil
+        'GET',
+        'foo,bar/t1,t2/_count',
+        {},
+        nil
       ]
     end
 
@@ -39,10 +39,10 @@ describe 'client#count' do
 
     let(:expected_args) do
       [
-          'GET',
-          '_count',
-          {},
-          { match: { foo: 'bar' } }
+        'POST',
+        '_count',
+        {},
+        { match: { foo: 'bar' } }
       ]
     end
 

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

@@ -8,10 +8,10 @@ describe 'client#delete_by_query' do
 
   let(:expected_args) do
     [
-        'POST',
-        'foo/_delete_by_query',
-        {},
-        { term: {} }
+      'POST',
+      'foo/_delete_by_query',
+      {},
+      { term: {} }
     ]
   end
 
@@ -42,18 +42,23 @@ describe 'client#delete_by_query' do
   end
 
   context 'when a query is provided' do
-
     let(:expected_args) do
       [
         'POST',
         'foo/_delete_by_query',
         { q: 'foo:bar' },
-        nil
+        { query: 'query' }
       ]
     end
 
     it 'performs the request' do
-      expect(client_double.delete_by_query(index: 'foo', q: 'foo:bar')).to eq({})
+      expect(
+        client_double.delete_by_query(
+          index: 'foo',
+          q: 'foo:bar',
+          body: { query: 'query' }
+        )
+      ).to eq({})
     end
   end
 end

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

@@ -5,20 +5,6 @@
 require 'spec_helper'
 
 describe 'client#delete_script' do
-
-  let(:expected_args) do
-    [
-        'DELETE',
-        '_scripts/groovy/foo',
-        {},
-        nil
-    ]
-  end
-
-  it 'performs the request' do
-    expect(client_double.delete_script(lang: 'groovy', id: 'foo')).to eq({})
-  end
-
   context 'when lang parameter is not provided' do
 
     let(:expected_args) do

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

@@ -42,7 +42,7 @@ describe 'client#exists' do
   context 'when the type parameter is not provided' do
 
     let(:url) do
-      'foo/_all/1'
+      'foo/_doc/1'
     end
 
     it 'performs the request' do

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

@@ -42,7 +42,7 @@ describe 'client#get_source' do
   context 'when the type parameter is not provided' do
 
     let(:url) do
-      'foo/_doc/1/_source'
+      'foo/_source/1'
     end
 
     it 'performs the request' do

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

@@ -28,7 +28,7 @@ describe 'client#index' do
   end
 
   let(:body) do
-    { :foo => 'bar' }
+    { foo: 'bar' }
   end
 
   let(:client) do
@@ -42,7 +42,7 @@ describe 'client#index' do
   end
 
   it 'performs the request' do
-    expect(client_double.index(index: 'foo', type: 'bar', body: { foo: 'bar' })).to eq({})
+    expect(client_double.index(index: 'foo', type: 'bar', body: body)).to eq({})
   end
 
   context 'when a specific id is provided' do
@@ -56,7 +56,7 @@ describe 'client#index' do
     end
 
     it 'performs the request' do
-      expect(client_double.index(index: 'foo', type: 'bar', id: '1', body: { foo: 'bar' })).to eq({})
+      expect(client_double.index(index: 'foo', type: 'bar', id: '1', body: body)).to eq({})
     end
   end
 
@@ -74,12 +74,8 @@ describe 'client#index' do
       { op_type: 'create' }
     end
 
-    let(:body) do
-      nil
-    end
-
     it 'passes the URL params' do
-      expect(client_double.index(index: 'foo', type: 'bar', op_type: 'create')).to eq({})
+      expect(client_double.index(index: 'foo', type: 'bar', op_type: 'create', body: body)).to eq({})
     end
 
     context 'when a specific id is provided' do
@@ -97,13 +93,12 @@ describe 'client#index' do
       end
 
       it 'passes the URL params' do
-        expect(client_double.index(index: 'foo', type: 'bar', id: '1', op_type: 'create')).to eq({})
+        expect(client_double.index(index: 'foo', type: 'bar', id: '1', op_type: 'create', body: body)).to eq({})
       end
     end
   end
 
   context 'when the request needs to be URL-escaped' do
-
     let(:request_type) do
       'PUT'
     end
@@ -112,12 +107,8 @@ describe 'client#index' do
       'foo/bar%2Fbam/123'
     end
 
-    let(:body) do
-      nil
-    end
-
     it 'URL-escapes the parts' do
-      expect(client_double.index(index: 'foo', type: 'bar/bam', id: '123')).to eq({})
+      expect(client_double.index(index: 'foo', type: 'bar/bam', id: '123', body: body)).to eq({})
     end
   end
 

data/spec/elasticsearch/api/actions/indices/analyze_spec.rb

@@ -38,10 +38,6 @@ describe 'client.indices#analyze' do
       'foo/_analyze'
     end
 
-    let(:params) do
-      { index: 'foo' }
-    end
-
     it 'performs the request' do
       expect(client_double.indices.analyze(index: 'foo')).to eq({})
     end

data/spec/elasticsearch/api/actions/indices/clear_cache_spec.rb

@@ -34,10 +34,6 @@ describe 'client.indices#clear_cache' do
       'foo/_cache/clear'
     end
 
-    let(:params) do
-      { index: 'foo' }
-    end
-
     it 'performs the request' do
       expect(client_double.indices.clear_cache(index: 'foo')).to eq({})
     end
@@ -61,7 +57,7 @@ describe 'client.indices#clear_cache' do
     end
 
     let(:params) do
-      { index: 'foo^bar' }
+      { }
     end
 
     it 'performs the request' do

data/spec/elasticsearch/api/actions/indices/clone_spec.rb

@@ -0,0 +1,109 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
+require 'spec_helper'
+
+describe 'client.indices#clone' do
+
+  let(:expected_args) do
+    [
+        'PUT',
+        url,
+        params,
+        body,
+        nil
+    ]
+  end
+
+  let(:params) do
+    {}
+  end
+
+  let(:body) do
+    nil
+  end
+
+  let(:url) do
+    'my_source_index/_clone/my_target_index'
+  end
+
+  context 'when there is no index specified' do
+
+    let(:client) do
+      Class.new { include Elasticsearch::API }.new
+    end
+
+    it 'raises an exception' do
+      expect {
+        client.indices.clone(target: 'my_target_index')
+      }.to raise_exception(ArgumentError)
+    end
+  end
+
+  context 'when there is no index specified' do
+
+    let(:client) do
+      Class.new { include Elasticsearch::API }.new
+    end
+
+    it 'raises an exception' do
+      expect {
+        client.indices.clone(index: 'my_source_index')
+      }.to raise_exception(ArgumentError)
+    end
+  end
+
+  context 'when an index and target are specified' do
+
+    it 'performs the request' do
+      expect(client_double.indices.clone(index: 'my_source_index', target: 'my_target_index')).to eq({})
+    end
+  end
+
+  context 'when params are provided' do
+
+    let(:params) do
+      {
+          timeout: '1s',
+          master_timeout: '10s',
+          wait_for_active_shards: 1
+      }
+    end
+
+    it 'performs the request' do
+      expect(client_double.indices.clone(index: 'my_source_index',
+                                         target: 'my_target_index',
+                                         timeout: '1s',
+                                         master_timeout: '10s',
+                                         wait_for_active_shards: 1)).to eq({})
+    end
+  end
+
+  context 'when a body is specified' do
+
+    let(:body) do
+      {
+          settings: {
+              'index.number_of_shards' => 5
+          },
+          aliases: {
+              my_search_indices: {}
+          }
+      }
+    end
+
+    it 'performs the request' do
+      expect(client_double.indices.clone(index: 'my_source_index',
+                                         target: 'my_target_index',
+                                         body: {
+                                             settings: {
+                                                 'index.number_of_shards' => 5
+                                             },
+                                             aliases: {
+                                                 my_search_indices: {}
+                                             }
+                                         })).to eq({})
+    end
+  end
+end

data/spec/elasticsearch/api/actions/indices/delete_alias_spec.rb

@@ -49,7 +49,7 @@ describe 'client.indices#delete_alias' do
   context 'when an index and name are specified' do
 
     let(:url) do
-      'foo/_alias/bar'
+      'foo/_aliases/bar'
     end
 
     it 'performs the request' do
@@ -60,7 +60,7 @@ describe 'client.indices#delete_alias' do
   context 'when the path must be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/_alias/bar%2Fbam'
+      'foo%5Ebar/_aliases/bar%2Fbam'
     end
 
     it 'performs the request' do

data/spec/elasticsearch/api/actions/indices/get_spec.rb

@@ -38,15 +38,4 @@ describe 'client.indices#get' do
       expect(client_double.indices.get(index: 'foo', ignore_unavailable: 1)).to eq({})
     end
   end
-
-  context 'when features are specified' do
-
-    let(:url) do
-      'foo/_settings'
-    end
-
-    it 'includes them in the URL' do
-      expect(client_double.indices.get(index: 'foo', feature: '_settings')).to eq({})
-    end
-  end
 end

data/spec/elasticsearch/api/actions/indices/put_alias_spec.rb

@@ -17,7 +17,7 @@ describe 'client.cluster#put_alias' do
   end
 
   let(:url) do
-    'foo/_alias/bar'
+    'foo/_aliases/bar'
   end
 
   let(:body) do
@@ -55,7 +55,7 @@ describe 'client.cluster#put_alias' do
   context 'when multiple indices are specified' do
 
     let(:url) do
-      'foo,bar/_alias/bam'
+      'foo,bar/_aliases/bam'
     end
 
     it 'performs the request' do
@@ -66,7 +66,7 @@ describe 'client.cluster#put_alias' do
   context 'when the path needs to be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/_alias/bar%2Fbam'
+      'foo%5Ebar/_aliases/bar%2Fbam'
     end
 
     it 'performs the request' do

data/spec/elasticsearch/api/actions/indices/put_mapping_spec.rb

@@ -17,7 +17,7 @@ describe 'client.cluster#put_mapping' do
   end
 
   let(:url) do
-    'foo/_mapping/bar'
+    'foo/bar/_mappings'
   end
 
   let(:body) do
@@ -68,7 +68,7 @@ describe 'client.cluster#put_mapping' do
   context 'when multiple indices are specified' do
 
     let(:url) do
-      'foo,bar/_mapping/bam'
+      'foo,bar/bam/_mappings'
     end
 
     it 'performs the request' do
@@ -79,7 +79,7 @@ describe 'client.cluster#put_mapping' do
   context 'when the path needs to be URL-escaped' do
 
     let(:url) do
-      'foo%5Ebar/_mapping/bar%2Fbam'
+      'foo%5Ebar/bar%2Fbam/_mappings'
     end
 
     it 'performs the request' do

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

@@ -66,7 +66,6 @@ describe 'client.cluster#stats' do
   end
 
   context 'when parameters are specified' do
-
     let(:params) do
       { expand_wildcards: true }
     end

data/spec/elasticsearch/api/actions/nodes/hot_threads_spec.rb

@@ -17,7 +17,7 @@ describe 'client.nodes#hot_threads' do
   end
 
   let(:url) do
-    '_nodes/hot_threads'
+    '_cluster/nodes/hot_threads'
   end
 
   it 'performs the request' do
@@ -27,7 +27,7 @@ describe 'client.nodes#hot_threads' do
   context 'when the node id is specified' do
 
     let(:url) do
-      '_nodes/foo/hot_threads'
+      '_cluster/nodes/foo/hot_threads'
     end
 
     it 'performs the request' do
@@ -38,7 +38,7 @@ describe 'client.nodes#hot_threads' do
   context 'when the path must be URL-escaped' do
 
     let(:url) do
-      '_nodes/foo%5Ebar/hot_threads'
+      '_cluster/nodes/foo%5Ebar/hot_threads'
     end
 
     it 'performs the request' do

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

@@ -5,28 +5,33 @@
 require 'spec_helper'
 
 describe 'client#put_script' do
+  let(:url) do
+    '_scripts/foo'
+  end
 
-  let(:expected_args) do
-    [
+  context 'when the lang parameter is provided' do
+    let(:expected_args) do
+      [
         'PUT',
         url,
-        { },
-        { script: 'bar' }
-    ]
-  end
-
-  let(:url) do
-    '_scripts/groovy/foo'
-  end
+        {},
+        { script: 'bar', lang: 'groovy' }
+      ]
+    end
 
-  it 'performs the request' do
-    expect(client_double.put_script(lang: 'groovy', id: 'foo', body: { script: 'bar' })).to eq({})
+    it 'performs the request' do
+      expect(client_double.put_script(id: 'foo', body: { script: 'bar', lang: 'groovy' })).to eq({})
+    end
   end
 
   context 'when the lang parameter is not provided' do
-
-    let(:url) do
-      '_scripts/foo'
+    let(:expected_args) do
+      [
+        'PUT',
+        url,
+        {},
+        { script: 'bar' }
+      ]
     end
 
     it 'performs the request' do

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

@@ -5,17 +5,33 @@
 require 'spec_helper'
 
 describe 'client#render_search_template' do
-
-  let(:expected_args) do
-    [
+  context 'when no id is specified' do
+    let(:expected_args) do
+      [
         'GET',
         '_render/template',
-        { id: 'foo' },
+        {},
         { foo: 'bar' }
-    ]
+      ]
+    end
+
+    it 'performs the request' do
+      expect(client_double.render_search_template(body: { foo: 'bar' })).to eq({})
+    end
   end
 
-  it 'performs the request' do
-    expect(client_double.render_search_template(id: 'foo', body: { foo: 'bar' })).to eq({})
+  context 'when id is specified' do
+    let(:expected_args) do
+      [
+        'GET',
+        '_render/template/foo',
+        {},
+        { foo: 'bar' }
+      ]
+    end
+
+    it 'performs the request' do
+      expect(client_double.render_search_template(id: 'foo', body: { foo: 'bar' })).to eq({})
+    end
   end
 end

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

@@ -0,0 +1,37 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
+require 'spec_helper'
+
+describe 'client#scroll' do
+  context 'with scroll_id as a param' do
+    let(:expected_args) do
+      [
+        'GET',
+        '_search/scroll/cXVlcn...',
+        {},
+        nil
+      ]
+    end
+
+    it 'performs the request' do
+      expect(client_double.scroll(scroll_id: 'cXVlcn...')).to eq({})
+    end
+  end
+
+  context 'with scroll_id in the body' do
+    let(:expected_args) do
+      [
+        'GET',
+        '_search/scroll',
+        {},
+        { scroll_id: 'cXVlcn...' }
+      ]
+    end
+
+    it 'performs the request' do
+      expect(client_double.scroll(body: { scroll_id: 'cXVlcn...' })).to eq({})
+    end
+  end
+end

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

@@ -117,19 +117,4 @@ describe 'client#search' do
       }.to raise_exception(ArgumentError)
     end
   end
-
-  context 'when the request field params are not URL-encoded' do
-
-    let(:params) do
-      { fields: 'foo^bar'}
-    end
-
-    let(:url) do
-      'foo/bar/_search'
-    end
-
-    it 'does not encode the field params' do
-      expect(client_double.search(index: 'foo', type: 'bar', fields: 'foo^bar'))
-    end
-  end
 end

data/spec/elasticsearch/api/actions/tasks/list_spec.rb

@@ -23,15 +23,4 @@ describe 'client.tasks#list' do
   it 'performs the request' do
     expect(client_double.tasks.list).to eq({})
   end
-
-  context 'when a task id is specified' do
-
-    let(:url) do
-      '_tasks/foo'
-    end
-
-    it 'performs the request' do
-      expect(client_double.tasks.list(task_id: 'foo')).to eq({})
-    end
-  end
 end