Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 2 deletions

diff --git a/spec/support/shared_examples/lib/gitlab/database/index_validators_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/database/index_validators_shared_examples.rb
index 0a8fd39bc2c..6b0ea9421de 100644
--- a/spec/support/shared_examples/lib/gitlab/database/index_validators_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/database/index_validators_shared_examples.rb
@@ -12,6 +12,8 @@ RSpec.shared_examples "index validators" do |validator, expected_result|
     ]
   end
 
+  let(:inconsistency_type) { validator.name.demodulize.underscore }
+
   let(:database_name) { 'main' }
 
   let(:database_model) { Gitlab::Database.database_base_models[database_name] }
@@ -29,7 +31,8 @@ RSpec.shared_examples "index validators" do |validator, expected_result|
     allow(connection).to receive(:exec_query).and_return(query_result)
   end
 
-  it 'returns extra indexes' do
-    expect(result.map(&:name)).to match_array(expected_result)
+  it 'returns index inconsistencies' do
+    expect(result.map(&:object_name)).to match_array(expected_result)
+    expect(result.map(&:type)).to all(eql inconsistency_type)
   end
 end