Add latest changes from gitlab-org/gitlab@master

1 files changed, 37 insertions, 0 deletions

diff --git a/spec/features/incidents/incident_details_spec.rb b/spec/features/incidents/incident_details_spec.rb
index dbcd524cad0..dad3dfd3440 100644
--- a/spec/features/incidents/incident_details_spec.rb
+++ b/spec/features/incidents/incident_details_spec.rb
@@ -6,6 +6,7 @@ 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, description: 'description') }
+  let_it_be(:escalation_status) { create(:incident_management_issuable_escalation_status, issue: incident) }
 
   before_all do
     project.add_developer(developer)
@@ -46,6 +47,42 @@ RSpec.describe 'Incident details', :js do
         expect(page).to have_selector('.right-sidebar[data-issuable-type="issue"]')
         expect(sidebar).to have_selector('.incident-severity')
         expect(sidebar).to have_selector('.milestone')
+        expect(sidebar).to have_selector('[data-testid="escalation_status_container"]')
+      end
+    end
+
+    context 'escalation status' do
+      let(:sidebar) { page.find('.right-sidebar') }
+      let(:widget) { sidebar.find('[data-testid="escalation_status_container"]') }
+      let(:expected_dropdown_options) { escalation_status.class::STATUSES.keys.take(3).map { |key| key.to_s.titleize } }
+
+      it 'has an interactable escalation status widget' do
+        expect(current_status).to have_text(escalation_status.status_name.to_s.titleize)
+
+        # list the available statuses
+        widget.find('[data-testid="edit-button"]').click
+        expect(dropdown_options.map(&:text)).to eq(expected_dropdown_options)
+        expect(widget).not_to have_selector('#escalation-status-help')
+
+        # update the status
+        select_resolved(dropdown_options)
+        expect(current_status).to have_text('Resolved')
+        expect(escalation_status.reload).to be_resolved
+      end
+
+      private
+
+      def dropdown_options
+        widget.all('[data-testid="status-dropdown-item"]', count: 3)
+      end
+
+      def select_resolved(options)
+        options.last.click
+        wait_for_requests
+      end
+
+      def current_status
+        widget.find('[data-testid="collapsed-content"]')
       end
     end
   end