[API] Adjust specs and code after test failures

Author: estolfo

elasticsearch-api/lib/elasticsearch/api/actions/clear_scroll.rb

@@ -28,7 +28,7 @@ module Actions
       #
       def clear_scroll(arguments={})
         method = Elasticsearch::API::HTTP_DELETE
-        path   = "_search/scroll/#{arguments[:scroll_id]}"
+        path   = Utils.__pathify '_search/scroll', Utils.__listify(arguments.delete(:scroll_id))
         params = {}
         body   = arguments[:body]
 

elasticsearch-api/lib/elasticsearch/api/actions/index.rb

@@ -1,20 +1,3 @@
-# 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
     module Actions
@@ -57,7 +40,7 @@ module Actions
       #     client.cluster.put_settings body: { transient: { 'indices.ttl.interval' => '1s' } }
       #
       #     # Enable the `_ttl` property for all types within the index
-      #     client.indices.create index: 'myindex', body: { mappings: { properties: { _ttl: { enabled: true } }  } }
+      #     client.indices.create index: 'myindex', body: { mappings: { mytype: { _ttl: { enabled: true } }  } }
       #
       #     client.index index: 'myindex', type: 'mytype', id: '1', body: { title: 'TEST' }, ttl: '5s'
       #
@@ -69,7 +52,7 @@ module Actions
       #
       # @option arguments [String] :id Document ID
       # @option arguments [String] :index The name of the index (*Required*)
-      # @option arguments [String] :type The type of the document
+      # @option arguments [String] :type The type of the document (*Required*)
       # @option arguments [Hash] :body The document (*Required*)
       # @option arguments [String] :wait_for_active_shards Sets the number of shard copies that must be active before proceeding with the index operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
       # @option arguments [String] :op_type Explicit operation type (options: index, create)
@@ -87,17 +70,21 @@ module Actions
       #
       def index(arguments={})
         raise ArgumentError, "Required argument 'index' missing" unless arguments[:index]
-        raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
-        method = Elasticsearch::API::HTTP_POST
-        path   = "#{arguments[:index]}/_doc"
-        params = Elasticsearch::API::Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
+        raise ArgumentError, "Required argument 'type' missing"  unless arguments[:type]
+        method = arguments[:id] ? HTTP_PUT : HTTP_POST
+        path   = Utils.__pathify Utils.__escape(arguments[:index]),
+                                 Utils.__escape(arguments[:type]),
+                                 Utils.__escape(arguments[:id])
+
+        params = Utils.__validate_and_extract_params arguments, ParamsRegistry.get(__method__)
         body   = arguments[:body]
+
         perform_request(method, path, params, body).body
       end
 
       # Register this action with its valid params when the module is loaded.
       #
-      # @since 6.1.1
+      # @since 6.2.0
       ParamsRegistry.register(:index, [
           :wait_for_active_shards,
           :op_type,

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

@@ -49,21 +49,4 @@
       expect(client_double.cluster.state(metric: ['foo', 'bar'])).to eq({})
     end
   end
-
-  context 'when index templates are specified' do
-
-    let(:expected_args) do
-      [
-          'GET',
-          '_cluster/state',
-          { index_templates: 'foo,bar' },
-          nil,
-          nil
-      ]
-    end
-
-    it 'performs the request' do
-      expect(client_double.cluster.state(index_templates: ['foo', 'bar'])).to eq({})
-    end
-  end
 end

elasticsearch-api/spec/elasticsearch/api/actions/count_percolate_spec.rb

@@ -32,25 +32,18 @@
     { }
   end
 
-  context 'when the `lang` parameter is specificed' do
-
-    let(:url) do
-      '_scripts/groovy/foo'
-    end
-
-    it 'performs the request' do
-      expect(client_double.get_script(lang: 'groovy', id: 'foo')).to eq({})
-    end
+  let(:url) do
+    '_scripts/foo'
   end
 
-  context 'when the `lang` parameter is not specificed' do
+  context 'when the `lang` parameter is specificed' do
 
-    let(:url) do
-      '_scripts/foo'
+    let(:params) do
+      { master_timeout: '1s' }
     end
 
     it 'performs the request' do
-      expect(client_double.get_script(id: 'foo')).to eq({})
+      expect(client_double.get_script(master_timeout: '1s', id: 'foo')).to eq({})
     end
   end
 end

elasticsearch-api/spec/elasticsearch/api/actions/delete_template_spec.rb

@@ -54,6 +54,12 @@
     }.to raise_exception(ArgumentError)
   end
 
+  it 'requires the :type argument' do
+    expect {
+      client.index(index: 'foo')
+    }.to raise_exception(ArgumentError)
+  end
+
   it 'performs the request' do
     expect(client_double.index(index: 'foo', type: 'bar', body: { foo: 'bar' })).to eq({})
   end
@@ -136,7 +142,7 @@
 
   context 'when an invalid URL parameter is provided' do
 
-    it 'raises an ArgumentError' do
+    it 'raises and ArgumentError' do
       expect {
         client.index(index: 'foo', type: 'bar', id: '1', qwerty: 'yuiop')
       }.to raise_exception(ArgumentError)

elasticsearch-api/spec/elasticsearch/api/actions/field_stats_spec.rb

@@ -60,17 +60,6 @@
     end
   end
 
-  context 'when an url params are specified' do
-
-    let(:params) do
-      { text: 'foo', analyzer: 'bar' }
-    end
-
-    it 'performs the request' do
-      expect(client_double.indices.analyze(text: 'foo', analyzer: 'bar')).to eq({})
-    end
-  end
-
   context 'when a body is specified' do
 
     let(:body) do
@@ -81,30 +70,4 @@
       expect(client_double.indices.analyze(body: 'foo')).to eq({})
     end
   end
-
-  context 'when filters are specified' do
-
-    let(:params) do
-      { filters: 'foo,bar', text: 'Test', tokenizer: 'whitespace' }
-    end
-
-    it 'performs the request' do
-      expect(client_double.indices.analyze(text: 'Test', tokenizer: 'whitespace', filters: ['foo,bar'])).to eq({})
-    end
-  end
-
-  context 'when path must be URL-escaped' do
-
-    let(:url) do
-      'foo%5Ebar/_analyze'
-    end
-
-    let(:params) do
-      { text: 'Test', index: 'foo^bar' }
-    end
-
-    it 'performs the request' do
-      expect(client_double.indices.analyze(index: 'foo^bar', text: 'Test')).to eq({})
-    end
-  end
 end