Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 1 deletions

diff --git a/spec/controllers/admin/cohorts_controller_spec.rb b/spec/controllers/admin/cohorts_controller_spec.rb
index d271276a3e4..766073977c6 100644
--- a/spec/controllers/admin/cohorts_controller_spec.rb
+++ b/spec/controllers/admin/cohorts_controller_spec.rb
@@ -13,5 +13,17 @@ RSpec.describe Admin::CohortsController do
     it_behaves_like 'tracking unique visits', :index do
       let(:target_id) { 'i_analytics_cohorts' }
     end
+
+    it_behaves_like 'Snowplow event tracking' do
+      subject { get :index }
+
+      let(:feature_flag_name) { :route_hll_to_snowplow_phase2 }
+      let(:category) { described_class.name }
+      let(:action) { 'perform_analytics_usage_action' }
+      let(:label) { 'redis_hll_counters.analytics.analytics_total_unique_counts_monthly' }
+      let(:property) { 'i_analytics_cohorts' }
+      let(:namespace) { nil }
+      let(:project) { nil }
+    end
   end
 end
diff --git a/spec/controllers/projects/settings/integration_hook_logs_controller_spec.rb b/spec/controllers/projects/settings/integration_hook_logs_controller_spec.rb
index 8261461e8aa..9569fe22b1f 100644
--- a/spec/controllers/projects/settings/integration_hook_logs_controller_spec.rb
+++ b/spec/controllers/projects/settings/integration_hook_logs_controller_spec.rb
@@ -5,7 +5,8 @@ require 'spec_helper'
 RSpec.describe Projects::Settings::IntegrationHookLogsController do
   let(:project) { create(:project, :repository) }
   let(:user) { create(:user) }
-  let(:integration) { create(:drone_ci_integration, project: project) }
+  let(:service_hook) { create(:service_hook) }
+  let(:integration) { create(:drone_ci_integration, project: project, service_hook: service_hook) }
   let(:log) { create(:web_hook_log, web_hook: integration.service_hook) }
   let(:log_params) do
     {