Add latest changes from gitlab-org/gitlab@master

2 files changed, 35 insertions, 12 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
new file mode 100644
index 00000000000..0a8fd39bc2c
--- /dev/null
+++ b/spec/support/shared_examples/lib/gitlab/database/index_validators_shared_examples.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.shared_examples "index validators" do |validator, expected_result|
+  let(:structure_file_path) { Rails.root.join('spec/fixtures/structure.sql') }
+  let(:database_indexes) do
+    [
+      ['wrong_index', 'CREATE UNIQUE INDEX wrong_index ON public.table_name (column_name)'],
+      ['extra_index', 'CREATE INDEX extra_index ON public.table_name (column_name)'],
+      ['index', 'CREATE UNIQUE INDEX "index" ON public.achievements USING btree (namespace_id, lower(name))']
+    ]
+  end
+
+  let(:database_name) { 'main' }
+
+  let(:database_model) { Gitlab::Database.database_base_models[database_name] }
+
+  let(:connection) { database_model.connection }
+
+  let(:query_result) { instance_double('ActiveRecord::Result', rows: database_indexes) }
+
+  let(:database) { Gitlab::Database::SchemaValidation::Database.new(connection) }
+  let(:structure_file) { Gitlab::Database::SchemaValidation::StructureSql.new(structure_file_path) }
+
+  subject(:result) { validator.new(structure_file, database).execute }
+
+  before do
+    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)
+  end
+end
diff --git a/spec/support/shared_examples/lib/gitlab/usage_data_counters/issuable_activity_shared_examples.rb b/spec/support/shared_examples/lib/gitlab/usage_data_counters/issuable_activity_shared_examples.rb
index d4802a19202..9873bab1caf 100644
--- a/spec/support/shared_examples/lib/gitlab/usage_data_counters/issuable_activity_shared_examples.rb
+++ b/spec/support/shared_examples/lib/gitlab/usage_data_counters/issuable_activity_shared_examples.rb
@@ -27,18 +27,6 @@ RSpec.shared_examples 'a daily tracked issuable snowplow and service ping events
 
     expect_snowplow_event(**{ category: category, action: event_action, user: user1 }.merge(event_params))
   end
-
-  context 'with route_hll_to_snowplow_phase2 disabled' do
-    before do
-      stub_feature_flags(route_hll_to_snowplow_phase2: false)
-    end
-
-    it 'does not emit snowplow event' do
-      track_action({ author: user1 }.merge(track_params))
-
-      expect_no_snowplow_event
-    end
-  end
 end
 
 RSpec.shared_examples 'daily tracked issuable snowplow and service ping events with project' do