Add latest changes from gitlab-org/gitlab@master

5 files changed, 39 insertions, 35 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
diff --git a/spec/support/shared_examples/models/concerns/integrations/base_slack_notification_shared_examples.rb b/spec/support/shared_examples/models/concerns/integrations/base_slack_notification_shared_examples.rb
index 2e528f7996c..2dad35dc46e 100644
--- a/spec/support/shared_examples/models/concerns/integrations/base_slack_notification_shared_examples.rb
+++ b/spec/support/shared_examples/models/concerns/integrations/base_slack_notification_shared_examples.rb
@@ -35,7 +35,6 @@ RSpec.shared_examples Integrations::BaseSlackNotification do |factory:|
         end
 
         it_behaves_like 'Snowplow event tracking with RedisHLL context' do
-          let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
           let(:category) { described_class.to_s }
           let(:action) { 'perform_integrations_action' }
           let(:namespace) { project.namespace }
diff --git a/spec/support/shared_examples/observability/csp_shared_examples.rb b/spec/support/shared_examples/observability/csp_shared_examples.rb
index 0cd211f69eb..9d6e7e75f4d 100644
--- a/spec/support/shared_examples/observability/csp_shared_examples.rb
+++ b/spec/support/shared_examples/observability/csp_shared_examples.rb
@@ -31,19 +31,19 @@ RSpec.shared_examples 'observability csp policy' do |controller_class = describe
   let(:observability_url) { Gitlab::Observability.observability_url }
   let(:signin_url) do
     Gitlab::Utils.append_path(Gitlab.config.gitlab.url,
-  '/users/sign_in')
+      '/users/sign_in')
   end
 
   let(:oauth_url) do
     Gitlab::Utils.append_path(Gitlab.config.gitlab.url,
-  '/oauth/authorize')
+      '/oauth/authorize')
   end
 
   before do
     setup_csp_for_controller(controller_class, csp, any_time: true)
     group.add_developer(user)
     login_as(user)
-    allow(Gitlab::Observability).to receive(:observability_enabled?).and_return(true)
+    stub_feature_flags(observability_group_tab: true)
   end
 
   subject do
@@ -67,7 +67,7 @@ RSpec.shared_examples 'observability csp policy' do |controller_class = describe
     end
 
     before do
-      allow(Gitlab::Observability).to receive(:observability_enabled?).and_return(false)
+      stub_feature_flags(observability_group_tab: false)
     end
 
     it 'does not add observability urls to the csp header' do
@@ -76,23 +76,6 @@ RSpec.shared_examples 'observability csp policy' do |controller_class = describe
     end
   end
 
-  context 'when checking if observability is enabled' do
-    let(:csp) do
-      ActionDispatch::ContentSecurityPolicy.new do |p|
-        p.frame_src 'https://something.test'
-      end
-    end
-
-    it 'check access for a given user and group' do
-      allow(Gitlab::Observability).to receive(:observability_enabled?)
-
-      get tested_path
-
-      expect(Gitlab::Observability).to have_received(:observability_enabled?)
-        .with(user, group).at_least(:once)
-    end
-  end
-
   context 'when frame-src exists in the CSP config' do
     let(:csp) do
       ActionDispatch::ContentSecurityPolicy.new do |p|
diff --git a/spec/support/shared_examples/services/snowplow_tracking_shared_examples.rb b/spec/support/shared_examples/services/snowplow_tracking_shared_examples.rb
index e72e8e79411..d3b3434b339 100644
--- a/spec/support/shared_examples/services/snowplow_tracking_shared_examples.rb
+++ b/spec/support/shared_examples/services/snowplow_tracking_shared_examples.rb
@@ -5,7 +5,6 @@ RSpec.shared_examples 'issue_edit snowplow tracking' do
   let(:action) { Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_ACTION }
   let(:label) { Gitlab::UsageDataCounters::IssueActivityUniqueCounter::ISSUE_LABEL }
   let(:namespace) { project.namespace }
-  let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
 
   it_behaves_like 'Snowplow event tracking with RedisHLL context'
 end