[Client] Fixes tests

Author: picandocodigo

api-spec-testing/test_file.rb

@@ -414,10 +414,10 @@ def clear_datastreams(client)
             client.xpack.indices.delete_data_stream(name: datastream['name'], expand_wildcards: 'all')
           end
           begin
-            client.indices.delete_data_stream(name: '*', expand_wildcards: 'all')
+            client.xpack.indices.delete_data_stream(name: '*', expand_wildcards: 'all')
           rescue StandardError => e
             LOGGER.error "Caught exception attempting to delete data streams: #{e}"
-            client.indices.delete_data_stream(name: '*')
+            client.xpack.indices.delete_data_stream(name: '*')
           end
         end
 

elasticsearch-transport/Rakefile

@@ -32,7 +32,6 @@ namespace :test do
     sh '../scripts/wait-cluster.sh'
   end
 
-  task spec: :wait_for_green
   RSpec::Core::RakeTask.new(:spec)
 
   Rake::TestTask.new(:unit) do |test|

elasticsearch-transport/spec/elasticsearch/transport/base_spec.rb

@@ -73,14 +73,14 @@
           expect(logger).not_to receive(:fatal).with(/secret_password/)
 
           expect {
-            client.cluster.stats
+            client.perform_request('GET', '_cluster/stats')
           }.to raise_exception(Faraday::SSLError)
         end
 
         it 'replaces the password with the string \'REDACTED\'' do
           expect(logger).to receive(:fatal).with(/REDACTED/)
           expect {
-            client.cluster.stats
+            client.perform_request('GET', '_cluster/stats')
           }.to raise_exception(Faraday::SSLError)
         end
       else
@@ -103,14 +103,14 @@
           expect(logger).not_to receive(:fatal).with(/secret_password/)
 
           expect {
-            client.cluster.stats
+            client.perform_request('GET', '_cluster/stats')
           }.to raise_exception(Faraday::SSLError)
         end
 
         it 'replaces the password with the string \'REDACTED\'' do
           expect(logger).to receive(:fatal).with(/REDACTED/)
           expect {
-            client.cluster.stats
+            client.perform_request('GET', '_cluster/stats')
           }.to raise_exception(Faraday::SSLError)
         end
       else

elasticsearch-transport/spec/elasticsearch/transport/client_spec.rb

@@ -1584,7 +1584,7 @@
 
       context 'when a block is provided' do
         let(:client) do
-          Elasticsearch::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
+          described_class.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
             client.headers['Accept'] = 'application/yaml'
           end
         end
@@ -1600,7 +1600,7 @@
 
         context 'when the Faraday adapter is set in the block' do
           let(:client) do
-            Elasticsearch::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
+            described_class.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
               client.adapter(:net_http_persistent)
             end
           end

elasticsearch-transport/spec/elasticsearch/transport/meta_header_spec.rb

@@ -232,7 +232,9 @@ def meta_version
     if defined?(JRUBY_VERSION)
       context 'when using manticore' do
         let(:client) do
-          Elasticsearch::Client.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore)
+          described_class.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore).tap do |client|
+            client.instance_variable_set('@verified', true)
+          end
         end
         let(:subject) { client.transport.connections.first.connection.instance_variable_get("@options")[:headers]}
 
@@ -244,7 +246,9 @@ def meta_version
     else
       context 'when using curb' do
         let(:client) do
-          Elasticsearch::Client.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Curb)
+          described_class.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Curb).tap do |client|
+            client.instance_variable_set('@verified', true)
+          end
         end
 
         it 'sets curb in the metaheader' do
@@ -255,15 +259,13 @@ def meta_version
     end
 
     context 'when using custom transport implementation' do
-      let (:transport_class) do
+      let(:transport_class) do
         Class.new do
-          include Elasticsearch::Transport::Transport::Base
-
           def initialize(args)
           end
         end
       end
-      let(:client) { Elasticsearch::Client.new(transport_class: transport_class) }
+      let(:client) { Elasticsearch::Transport::Client.new(transport_class: transport_class) }
       let(:subject) { client.instance_variable_get('@arguments')[:transport_options][:headers] }
       let(:meta_header) do
         if jruby?
@@ -284,7 +286,11 @@ def initialize(args)
         stub_const('Elastic::ELASTICSEARCH_SERVICE_VERSION', [:ent, '8.0.0'])
       end
 
-      let(:client) { Elasticsearch::Client.new }
+      let(:client) do
+        described_class.new.tap do |client|
+          client.instance_variable_set('@verified', true)
+        end
+      end
 
       it 'sets the service version in the metaheader' do
         expect(subject['x-elastic-client-meta']).to match(regexp)