Updates elasticsearch helper integration tests

Author: picandocodigo

elasticsearch/spec/integration/client_integration_spec.rb

@@ -48,7 +48,7 @@
   context 'Reports the right meta header' do
     it 'Reports es service name and gem version' do
       headers = CLIENT.transport.connections.first.connection.headers
-      version = Class.new.extend(Elastic::Transport::MetaHeader).send(:CLIENT_meta_version, Elasticsearch::VERSION)
+      version = Class.new.extend(Elastic::Transport::MetaHeader).send(:client_meta_version, Elasticsearch::VERSION)
       expect(headers['x-elastic-client-meta']).to match /^es=#{version}/
     end
   end

elasticsearch/spec/integration/helpers/bulk_helper_spec.rb

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-require_relative 'helpers_spec_helper'
+require_relative File.expand_path('../../spec_helper', __dir__)
 require 'elasticsearch/helpers/bulk_helper'
 require 'tempfile'
 
@@ -23,25 +23,25 @@
     let(:index) { 'bulk_animals' }
     let(:index_slice) { 'bulk_animals_slice' }
     let(:params) { { refresh: 'wait_for' } }
-    let(:bulk_helper) { Elasticsearch::Helpers::BulkHelper.new(client, index, params) }
+    let(:bulk_helper) { Elasticsearch::Helpers::BulkHelper.new(CLIENT, index, params) }
     let(:docs) do
       [
-        { scientific_name: 'Lama guanicoe', name:'Guanaco' },
-        { scientific_name: 'Tayassu pecari', name:'White-lipped peccary' },
-        { scientific_name: 'Snycerus caffer', name:'Buffalo, african' },
-        { scientific_name: 'Coluber constrictor', name:'Snake, racer' },
-        { scientific_name: 'Thalasseus maximus', name:'Royal tern' },
-        { scientific_name: 'Centrocercus urophasianus', name:'Hen, sage' },
-        { scientific_name: 'Sitta canadensis', name:'Nuthatch, red-breasted' },
-        { scientific_name: 'Aegypius tracheliotus', name:'Vulture, lappet-faced' },
-        { scientific_name: 'Bucephala clangula', name:'Common goldeneye' },
-        { scientific_name: 'Felis pardalis', name:'Ocelot' }
+        { scientific_name: 'Lama guanicoe', name: 'Guanaco' },
+        { scientific_name: 'Tayassu pecari', name: 'White-lipped peccary' },
+        { scientific_name: 'Snycerus caffer', name: 'Buffalo, african' },
+        { scientific_name: 'Coluber constrictor', name: 'Snake, racer' },
+        { scientific_name: 'Thalasseus maximus', name: 'Royal tern' },
+        { scientific_name: 'Centrocercus urophasianus', name: 'Hen, sage' },
+        { scientific_name: 'Sitta canadensis', name: 'Nuthatch, red-breasted' },
+        { scientific_name: 'Aegypius tracheliotus', name: 'Vulture, lappet-faced' },
+        { scientific_name: 'Bucephala clangula', name: 'Common goldeneye' },
+        { scientific_name: 'Felis pardalis', name: 'Ocelot' }
       ]
     end
 
     after do
-      client.indices.delete(index: index, ignore: 404)
-      client.indices.delete(index: index_slice, ignore: 404)
+      CLIENT.indices.delete(index: index, ignore: 404)
+      CLIENT.indices.delete(index: index_slice, ignore: 404)
     end
 
     it 'Ingests documents' do
@@ -58,9 +58,9 @@
       ]
       bulk_helper.ingest(docs)
       # Get the ingested documents, add id and modify them to update them:
-      animals = client.search(index: index)['hits']['hits']
+      animals = CLIENT.search(index: index)['hits']['hits']
       # Add id to each doc
-      docs = animals.map { |animal| animal['_source'].merge({'id' => animal['_id'] }) }
+      docs = animals.map { |animal| animal['_source'].merge({ 'id' => animal['_id'] }) }
       docs.map { |doc| doc['scientific_name'].upcase! }
       response = bulk_helper.update(docs)
       expect(response.status).to eq(200)
@@ -73,17 +73,17 @@
       response = bulk_helper.delete(ids)
       expect(response.status).to eq 200
       expect(response['items'].map { |item| item['delete']['result'] }.uniq.first).to eq('deleted')
-      expect(client.count(index: index)['count']).to eq(0)
+      expect(CLIENT.count(index: index)['count']).to eq(0)
     end
 
     it 'Ingests documents and yields response and docs' do
       slice = 2
-      bulk_helper = Elasticsearch::Helpers::BulkHelper.new(client, index_slice, params)
-      response = bulk_helper.ingest(docs, {slice: slice}) do |response, docs|
+      bulk_helper = Elasticsearch::Helpers::BulkHelper.new(CLIENT, index_slice, params)
+      bulk_helper.ingest(docs, { slice: slice }) do |response, docs|
         expect(response).to be_an_instance_of Elasticsearch::API::Response
         expect(docs.count).to eq slice
       end
-      response = client.search(index: index_slice, size: 200)
+      response = CLIENT.search(index: index_slice, size: 200)
       expect(response['hits']['hits'].map { |a| a['_source'].transform_keys(&:to_sym) }).to eq docs
     end
 

elasticsearch/spec/integration/helpers/esql_helper_spec.rb

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-require_relative 'helpers_spec_helper'
+require_relative File.expand_path('../../spec_helper', __dir__)
 require 'elasticsearch/helpers/esql_helper'
 require 'ipaddr'
 
@@ -24,48 +24,55 @@
   let(:esql_helper) { Elasticsearch::Helpers::ESQLHelper }
   let(:query) do
     <<~ESQL
-        FROM #{index}
-        | EVAL duration_ms = ROUND(event.duration / 1000000.0, 1)
+      FROM #{index}
+      | EVAL duration_ms = ROUND(event.duration / 1000000.0, 1)
     ESQL
   end
 
   before do
-    client.indices.create(
+    CLIENT.indices.create(
       index: index,
       body: {
         mappings: {
           properties: { 'client.ip' => { type: 'ip' }, message: { type: 'keyword' } }
         }
       }
     )
-    client.bulk(
+    CLIENT.bulk(
       index: index,
       body: [
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T12:15:03.360Z', 'client.ip' => '172.21.2.162', message: 'Connected to 10.1.0.3', 'event.duration' => 3450233},
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T12:27:28.948Z', 'client.ip' => '172.21.2.113', message: 'Connected to 10.1.0.2', 'event.duration' => 2764889},
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T13:33:34.937Z', 'client.ip' => '172.21.0.5', message: 'Disconnected', 'event.duration' => 1232382},
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T13:51:54.732Z', 'client.ip' => '172.21.3.15', message: 'Connection error', 'event.duration' => 725448},
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T13:52:55.015Z', 'client.ip' => '172.21.3.15', message: 'Connection error', 'event.duration' => 8268153},
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T13:53:55.832Z', 'client.ip' => '172.21.3.15', message: 'Connection error', 'event.duration' => 5033755},
-        {'index': {}},
-        {'@timestamp' => '2023-10-23T13:55:01.543Z', 'client.ip' => '172.21.3.15', message: 'Connected to 10.1.0.1', 'event.duration' => 1756467}
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T12:15:03.360Z', 'client.ip' => '172.21.2.162', message: 'Connected to 10.1.0.3',
+          'event.duration' => 3_450_233 },
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T12:27:28.948Z', 'client.ip' => '172.21.2.113', message: 'Connected to 10.1.0.2',
+          'event.duration' => 2_764_889 },
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T13:33:34.937Z', 'client.ip' => '172.21.0.5', message: 'Disconnected',
+          'event.duration' => 1_232_382 },
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T13:51:54.732Z', 'client.ip' => '172.21.3.15', message: 'Connection error',
+          'event.duration' => 725_448 },
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T13:52:55.015Z', 'client.ip' => '172.21.3.15', message: 'Connection error',
+          'event.duration' => 8_268_153 },
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T13:53:55.832Z', 'client.ip' => '172.21.3.15', message: 'Connection error',
+          'event.duration' => 5_033_755 },
+        { 'index': {} },
+        { '@timestamp' => '2023-10-23T13:55:01.543Z', 'client.ip' => '172.21.3.15', message: 'Connected to 10.1.0.1',
+          'event.duration' => 1_756_467 }
       ],
       refresh: true
     )
   end
 
   after do
-    client.indices.delete(index: index)
+    CLIENT.indices.delete(index: index)
   end
 
   it 'returns an ESQL response as a relational key/value object' do
-    response = esql_helper.query(client, query)
+    response = esql_helper.query(CLIENT, query)
     expect(response.count).to eq 7
     expect(response.first.keys).to eq ['duration_ms', 'message', 'event.duration', 'client.ip', '@timestamp']
     response.each do |r|
@@ -82,7 +89,7 @@
       'client.ip' => Proc.new { |i| IPAddr.new(i) },
       'event.duration' => Proc.new { |d| d.to_s }
     }
-    response = esql_helper.query(client, query, parser: parser)
+    response = esql_helper.query(CLIENT, query, parser: parser)
     response.each do |r|
       expect(r['@timestamp']).to be_a DateTime
       expect(r['client.ip']).to be_a IPAddr
@@ -92,7 +99,7 @@
   end
 
   it 'parser does not error when value is nil, leaves nil' do
-    client.index(
+    CLIENT.index(
       index: index,
       body: {
         '@timestamp' => nil,
@@ -107,7 +114,7 @@
       'client.ip' => Proc.new { |i| IPAddr.new(i) },
       'event.duration' => Proc.new { |d| d.to_s }
     }
-    response = esql_helper.query(client, query, parser: parser)
+    response = esql_helper.query(CLIENT, query, parser: parser)
     response.each do |r|
       expect [DateTime, NilClass].include?(r['@timestamp'].class)
       expect [IPAddr, NilClass].include?(r['client.ip'].class)

elasticsearch/spec/integration/helpers/helpers_spec_helper.rb

@@ -14,14 +14,14 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-require_relative 'helpers_spec_helper'
+require_relative File.expand_path('../../spec_helper', __dir__)
 require 'elasticsearch/helpers/scroll_helper'
 
 context 'Elasticsearch client helpers' do
   context 'ScrollHelper' do
     let(:index) { 'books' }
     let(:body) { { size: 12, query: { match_all: {} } } }
-    let(:scroll_helper) { Elasticsearch::Helpers::ScrollHelper.new(client, index, body) }
+    let(:scroll_helper) { Elasticsearch::Helpers::ScrollHelper.new(CLIENT, index, body) }
 
     before do
       documents = [
@@ -50,11 +50,11 @@
         { index: { _index: index, data: {name: "The Left Hand of Darkness", "author": "Ursula K. Le Guin", "release_date": "1969-06-01", "page_count": 304} } },
         { index: { _index: index, data: {name: "The Moon is a Harsh Mistress", "author": "Robert A. Heinlein", "release_date": "1966-04-01", "page_count": 288 } } }
       ]
-      client.bulk(body: documents, refresh: 'wait_for')
+      CLIENT.bulk(body: documents, refresh: 'wait_for')
     end
 
     after do
-      client.indices.delete(index: index)
+      CLIENT.indices.delete(index: index)
     end
 
     it 'instantiates a scroll helper' do
@@ -63,7 +63,7 @@
 
     it 'searches an index' do
       my_documents = []
-      while !(documents = scroll_helper.results).empty?
+      until (documents = scroll_helper.results).empty?
         my_documents << documents
       end