fix(ci) add distribution to the elasticsearch examples

marcosgz · Jul 6, 2023 · 5ab20a1 · 5ab20a1
1 parent bcc9b26
commit 5ab20a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/spec/esse/cluster_spec.rb b/spec/esse/cluster_spec.rb
@@ -238,7 +238,7 @@
   describe '#info' do
     subject { model.info }
 
-    context 'with elasticsearch 1.x', es_version: '1.x' do
+    context 'with elasticsearch 1.x', es_version: '1.x', distribution: 'elasticsearch' do
       specify do
         body = elasticsearch_response_fixture(file: 'info', version: '1.x', assigns: { version__number: version = '1.7.6' })
         stub_es_request(:get, '/', res: { body: body })
@@ -249,7 +249,7 @@
       end
     end
 
-    context 'with elasticsearch 2.x', es_version: '2.x' do
+    context 'with elasticsearch 2.x', es_version: '2.x', distribution: 'elasticsearch' do
       specify do
         body = elasticsearch_response_fixture(file: 'info', version: '2.x', assigns: { version__number: version = '2.0.0' })
         stub_es_request(:get, '/', res: { body: body })
@@ -260,7 +260,7 @@
       end
     end
 
-    context 'with elasticsearch 5.x', es_version: '5.x' do
+    context 'with elasticsearch 5.x', es_version: '5.x', distribution: 'elasticsearch' do
       specify do
         body = elasticsearch_response_fixture(file: 'info', version: '5.x', assigns: { version__number: version = '5.0.0' })
         stub_es_request(:get, '/', res: { body: body })
@@ -271,7 +271,7 @@
       end
     end
 
-    context 'with elasticsearch 6.x', es_version: '6.x' do
+    context 'with elasticsearch 6.x', es_version: '6.x', distribution: 'elasticsearch' do
       specify do
         body = elasticsearch_response_fixture(file: 'info', version: '6.x', assigns: { version__number: version = '6.0.0' })
         stub_es_request(:get, '/', res: { body: body })
@@ -282,7 +282,7 @@
       end
     end
 
-    context 'with elasticsearch 7.x', es_version: '7.x' do
+    context 'with elasticsearch 7.x', es_version: '7.x', distribution: 'elasticsearch' do
       specify do
         body = elasticsearch_response_fixture(file: 'info', version: '7.x', assigns: { version__number: version = '7.0.0' })
         stub_es_request(:get, '/', res: { body: body })
@@ -293,7 +293,7 @@
       end
     end
 
-    context 'with elasticsearch 8.x', es_version: '8.x' do
+    context 'with elasticsearch 8.x', es_version: '8.x', distribution: 'elasticsearch' do
       specify do
         body = elasticsearch_response_fixture(file: 'info', version: '8.x', assigns: { version__number: version = '8.0.0' })
         stub_es_request(:get, '/', res: { body: body })

diff --git a/spec/support/shared_examples/index_documents_index.rb b/spec/support/shared_examples/index_documents_index.rb
@@ -45,9 +45,7 @@
       expect {
         resp = VenuesIndex.index(id: 1, body: { name: 'New Name' }, **params)
       }.not_to raise_error
-      if %w[1.x 2.x].include?(example.metadata[:es_version])
-        expect(resp['created']).to eq(true)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('created')
       end
 
@@ -82,9 +80,7 @@
       expect {
         resp = VenuesIndex.index(id: 1, body: { name: 'New Name' }, suffix: '2022', **params)
       }.not_to raise_error
-      if %w[1.x 2.x].include?(example.metadata[:es_version])
-        expect(resp['created']).to eq(true)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('created')
       end
       expect(resp['_index']).to eq("#{cluster.index_prefix}_venues_2022")
@@ -122,9 +118,7 @@
       expect {
         resp = VenuesIndex.index(document)
       }.not_to raise_error
-      if %w[1.x 2.x].include?(example.metadata[:es_version])
-        expect(resp['created']).to eq(true)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('created')
       end