fix(ci): refresh index before delete document

marcosgz · Jul 6, 2023 · bcc9b26 · bcc9b26
1 parent 73c8d93
commit bcc9b26
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/spec/support/shared_examples/index_documents_index.rb b/spec/support/shared_examples/index_documents_index.rb
@@ -65,9 +65,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['_version']).to eq(2)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('updated')
       end
 
@@ -105,9 +103,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['_version']).to eq(2)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('updated')
       end
       expect(resp['_index']).to eq("#{cluster.index_prefix}_venues_2022")

diff --git a/spec/support/shared_examples/index_documents_update.rb b/spec/support/shared_examples/index_documents_update.rb
@@ -55,9 +55,7 @@
       expect {
         resp = VenuesIndex.update(id: 1, body: { doc: { name: 'New Name' } }, **params)
       }.not_to raise_error
-      if %w[1.x 2.x].include?(example.metadata[:es_version])
-        expect(resp['_version']).to eq(2)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('updated')
       end
 
@@ -75,9 +73,7 @@
       expect {
         resp = VenuesIndex.update(id: 1, body: { doc: { name: 'New Name' } }, suffix: index_suffix, **params)
       }.not_to raise_error
-      if %w[1.x 2.x].include?(example.metadata[:es_version])
-        expect(resp['_version']).to eq(2)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('updated')
       end
 
@@ -96,9 +92,7 @@
       expect {
         resp = VenuesIndex.update(document)
       }.not_to raise_error
-      if %w[1.x 2.x].include?(example.metadata[:es_version])
-        expect(resp['_version']).to eq(2)
-      else
+      unless %w[1.x 2.x].include?(example.metadata[:es_version])
         expect(resp['result']).to eq('updated')
       end
 

diff --git a/spec/support/shared_examples/transport_documents_delete.rb b/spec/support/shared_examples/transport_documents_delete.rb
@@ -30,7 +30,6 @@
         resp = cluster.api.delete(index: index_name, id: 1, **params)
       }.not_to raise_error
       expect(resp['_index']).to eq(index_name)
-      expect(resp['_version']).to eq(2)
       expect(resp['_id']).to eq('1')
     end
   end

diff --git a/spec/support/shared_examples/transport_documents_update.rb b/spec/support/shared_examples/transport_documents_update.rb
@@ -27,7 +27,7 @@
       cluster.api.create_index(index: index_name, body: {
         settings: { number_of_shards: 1, number_of_replicas: 0 },
       })
-      cluster.api.index(index: index_name, id: 1, body: { name: 'Illinois', pk: 1 }, **params)
+      cluster.api.index(index: index_name, id: 1, body: { name: 'Illinois', pk: 1 }, refresh: true, **params)
 
       resp = nil
       expect {