Add latest changes from gitlab-org/gitlab@master

1 files changed, 17 insertions, 7 deletions

diff --git a/spec/helpers/projects/alert_management_helper_spec.rb b/spec/helpers/projects/alert_management_helper_spec.rb
index 41f0f54b5ac..e1b01f4c196 100644
--- a/spec/helpers/projects/alert_management_helper_spec.rb
+++ b/spec/helpers/projects/alert_management_helper_spec.rb
@@ -10,34 +10,44 @@ describe Projects::AlertManagementHelper do
   let_it_be(:project_path) { project.full_path }
 
   describe '#alert_management_data' do
-    let(:user_can_enable_alert_management) { false }
-    let(:setting_path) { project_settings_operations_path(project) }
+    let(:user_can_enable_alert_management) { true }
+    let(:setting_path) { edit_project_service_path(project, AlertsService) }
 
     before do
       allow(helper)
         .to receive(:can?)
-        .with(current_user, :admin_operations, project)
+        .with(current_user, :admin_project, project)
         .and_return(user_can_enable_alert_management)
     end
 
     context 'without alert_managements_setting' do
       it 'returns index page configuration' do
-        expect(alert_management_data(current_user, project)).to eq(
+        expect(helper.alert_management_data(current_user, project)).to match(
           'project-path' => project_path,
           'enable-alert-management-path' => setting_path,
-          'empty-alert-svg-path' => '/images/illustrations/alert-management-empty-state.svg',
-          'user-can-enable-alert-management' => 'false',
+          'empty-alert-svg-path' => match_asset_path('/assets/illustrations/alert-management-empty-state.svg'),
+          'user-can-enable-alert-management' => 'true',
           'alert-management-enabled' => 'true'
         )
       end
     end
+
+    context 'when user does not have requisite enablement permissions' do
+      let(:user_can_enable_alert_management) { false }
+
+      it 'shows error tracking enablement as disabled' do
+        expect(helper.alert_management_data(current_user, project)).to include(
+          'user-can-enable-alert-management' => 'false'
+        )
+      end
+    end
   end
 
   describe '#alert_management_detail_data' do
     let(:alert_id) { 1 }
 
     it 'returns detail page configuration' do
-      expect(alert_management_detail_data(project_path, alert_id)).to eq(
+      expect(helper.alert_management_detail_data(project_path, alert_id)).to eq(
         'alert-id' => alert_id,
         'project-path' => project_path
       )