Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 1 deletions

diff --git a/spec/features/incidents/incident_details_spec.rb b/spec/features/incidents/incident_details_spec.rb
index 6db767dbddb..3ec7717b649 100644
--- a/spec/features/incidents/incident_details_spec.rb
+++ b/spec/features/incidents/incident_details_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe 'Incident details', :js do
   let_it_be(:project) { create(:project) }
   let_it_be(:developer) { create(:user) }
-  let_it_be(:incident) { create(:incident, project: project, author: developer) }
+  let_it_be(:incident) { create(:incident, project: project, author: developer, description: 'description') }
 
   before_all do
     project.add_developer(developer)
@@ -28,5 +28,25 @@ RSpec.describe 'Incident details', :js do
     it 'does not show design management' do
       expect(page).not_to have_selector('.js-design-management')
     end
+
+    it 'shows the incident tabs' do
+      page.within('.issuable-details') do
+        incident_tabs = find('[data-testid="incident-tabs"]')
+
+        expect(find('h2')).to have_content(incident.title)
+        expect(incident_tabs).to have_content('Summary')
+        expect(incident_tabs).to have_content(incident.description)
+      end
+    end
+
+    it 'shows the right sidebar mounted with type issue' do
+      page.within('.layout-page') do
+        sidebar = find('.right-sidebar')
+
+        expect(page).to have_selector('.right-sidebar[data-issuable-type="issue"]')
+        expect(sidebar).to have_selector('.incident-severity')
+        expect(sidebar).not_to have_selector('.milestone')
+      end
+    end
   end
 end