Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 1 deletions

diff --git a/spec/features/incidents/incident_timeline_events_spec.rb b/spec/features/incidents/incident_timeline_events_spec.rb
index 7404ac64cc9..a4449ee2608 100644
--- a/spec/features/incidents/incident_timeline_events_spec.rb
+++ b/spec/features/incidents/incident_timeline_events_spec.rb
@@ -96,5 +96,6 @@ RSpec.describe 'Incident timeline events', :js, feature_category: :incident_mana
 
   it_behaves_like 'for each incident details route',
       'add, edit, and delete timeline events',
-      tab_text: s_('Incident|Timeline')
+      tab_text: s_('Incident|Timeline'),
+      tab: 'timeline'
 end
diff --git a/spec/features/incidents/user_views_alert_details_spec.rb b/spec/features/incidents/user_views_alert_details_spec.rb
new file mode 100644
index 00000000000..f3d0273071c
--- /dev/null
+++ b/spec/features/incidents/user_views_alert_details_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'User uploads alerts to incident', :js, feature_category: :incident_management do
+  let_it_be(:incident) { create(:incident) }
+  let_it_be(:project) { incident.project }
+  let_it_be(:user) { create(:user, developer_projects: [project]) }
+
+  context 'with alert' do
+    let_it_be(:alert) { create(:alert_management_alert, issue_id: incident.id, project: project) }
+
+    shared_examples 'shows alert tab with details' do
+      specify do
+        expect(page).to have_link(s_('Incident|Alert details'))
+        expect(page).to have_content(alert.title)
+      end
+    end
+
+    it_behaves_like 'for each incident details route',
+      'shows alert tab with details',
+      tab_text: s_('Incident|Alert details'),
+      tab: 'alerts'
+  end
+
+  context 'with no alerts' do
+    it 'hides the Alert details tab' do
+      sign_in(user)
+      visit project_issue_path(project, incident)
+
+      expect(page).not_to have_link(s_('Incident|Alert details'))
+    end
+  end
+end