[MODEL] Updates ES client spec for client 7.14.0

Author: picandocodigo

elasticsearch-model/spec/elasticsearch/model/client_spec.rb

@@ -33,14 +33,14 @@ class ::DummyClientModel
   context 'when a class includes the client module class methods' do
 
     it 'defines the client module class methods on the model' do
-      expect(DummyClientModel.client).to be_a(Elasticsearch::Transport::Client)
+      expect(DummyClientModel.client).to be_a(Elasticsearch::Client)
     end
   end
 
   context 'when a class includes the client module instance methods' do
 
     it 'defines the client module class methods on the model' do
-      expect(DummyClientModel.new.client).to be_a(Elasticsearch::Transport::Client)
+      expect(DummyClientModel.new.client).to be_a(Elasticsearch::Client)
     end
   end
 
@@ -77,7 +77,7 @@ class ::DummyClientModel
     end
 
     it 'does not set the client on the class' do
-      expect(DummyClientModel.client).to be_a(Elasticsearch::Transport::Client)
+      expect(DummyClientModel.client).to be_a(Elasticsearch::Client)
     end
   end
 end

elasticsearch-model/spec/elasticsearch/model/indexing_spec.rb

@@ -676,15 +676,13 @@ class ::DummyIndexingModelForRecreate
     end
 
     context 'when the index is not found' do
+      let(:logger) { nil }
+      let(:transport) do
+        Elasticsearch::Transport::Client.new(logger: logger)
+      end
+
       let(:client) do
-        double(
-          'client',
-          indices: indices,
-          transport: double(
-            'transport',
-            double('transport', { logger: nil })
-          )
-        )
+        double('client', indices: indices, transport: transport)
       end
 
       let(:indices) do
@@ -698,19 +696,17 @@ class ::DummyIndexingModelForRecreate
       end
 
       context 'when the force option is true' do
-
         it 'deletes the index without raising an exception' do
           expect(DummyIndexingModelForRecreate.delete_index!(force: true)).to be_nil
         end
 
         context 'when the client has a logger' do
-
           let(:logger) do
             Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
           end
 
           let(:client) do
-            double('client', indices: indices, transport: double('transport', { logger: logger }))
+            double('client', indices: indices, transport: transport)
           end
 
           it 'deletes the index without raising an exception' do
@@ -918,7 +914,11 @@ class ::DummyIndexingModelForRefresh
     end
 
     let(:client) do
-      double('client', indices: indices, transport: double('transport', { logger: nil }))
+      double('client', indices: indices, transport: transport)
+    end
+
+    let(:transport) do
+      Elasticsearch::Transport::Client.new(logger: nil)
     end
 
     let(:indices) do
@@ -930,9 +930,7 @@ class ::DummyIndexingModelForRefresh
     end
 
     context 'when the force option is true' do
-
       context 'when the operation raises a NotFound exception' do
-
         before do
           expect(indices).to receive(:refresh).and_raise(NotFound)
         end
@@ -942,13 +940,16 @@ class ::DummyIndexingModelForRefresh
         end
 
         context 'when the client has a logger' do
-
           let(:logger) do
             Logger.new(STDOUT).tap { |l| l.level = Logger::DEBUG }
           end
 
           let(:client) do
-            double('client', indices: indices, transport: double('transport', { logger: logger }))
+            double('client', indices: indices, transport: transport)
+          end
+
+          let(:transport) do
+            Elasticsearch::Transport::Client.new(logger: logger)
           end
 
           it 'does not raise an exception' do
@@ -963,7 +964,6 @@ class ::DummyIndexingModelForRefresh
       end
 
       context 'when the operation raises another type of exception' do
-
         before do
           expect(indices).to receive(:refresh).and_raise(Exception)
         end
@@ -977,7 +977,6 @@ class ::DummyIndexingModelForRefresh
     end
 
     context 'when an index name is provided in the options' do
-
       before do
         expect(indices).to receive(:refresh).with(index: 'custom-foo')
       end

elasticsearch-model/spec/elasticsearch/model/module_spec.rb

@@ -22,7 +22,7 @@
   describe '#client' do
 
     it 'should have a default' do
-      expect(Elasticsearch::Model.client).to be_a(Elasticsearch::Transport::Client)
+      expect(Elasticsearch::Model.client).to be_a(Elasticsearch::Client)
     end
   end