From c642d6f861058068797fb5155d51c4c99797e4aa Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 10 Oct 2022 15:09:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/incidents/incident_timeline_events_spec.rb | 1 - spec/features/issues/incident_issue_spec.rb | 16 ---------------- .../merge_request/user_sees_merge_widget_spec.rb | 2 -- 3 files changed, 19 deletions(-) (limited to 'spec/features') diff --git a/spec/features/incidents/incident_timeline_events_spec.rb b/spec/features/incidents/incident_timeline_events_spec.rb index 6db9f87d6f2..ef0eb27d310 100644 --- a/spec/features/incidents/incident_timeline_events_spec.rb +++ b/spec/features/incidents/incident_timeline_events_spec.rb @@ -12,7 +12,6 @@ RSpec.describe 'Incident timeline events', :js do end before do - stub_feature_flags(incident_timeline: true) sign_in(developer) visit project_issues_incident_path(project, incident) diff --git a/spec/features/issues/incident_issue_spec.rb b/spec/features/issues/incident_issue_spec.rb index 509ff7d4023..d6cde466d1b 100644 --- a/spec/features/issues/incident_issue_spec.rb +++ b/spec/features/issues/incident_issue_spec.rb @@ -26,7 +26,6 @@ RSpec.describe 'Incident Detail', :js do context 'when user displays the incident' do before do - stub_feature_flags(incident_timeline: project) project.add_developer(user) sign_in(user) @@ -97,20 +96,5 @@ RSpec.describe 'Incident Detail', :js do end end end - - context 'when incident_timeline feature flag is disabled' do - before do - stub_feature_flags(incident_timeline: false) - - visit project_issues_incident_path(project, incident) - wait_for_requests - end - - it 'does not show Timeline tab' do - tabs = find('[data-testid="incident-tabs"]') - - expect(tabs).not_to have_content('Timeline') - end - end end end diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index 5a0af17dc15..77ac6fac22f 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -22,8 +22,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js do project_only_mwps.add_maintainer(user) sign_in(user) - stub_feature_flags(refactor_mr_widgets_extensions: false) - stub_feature_flags(refactor_mr_widgets_extensions_user: false) stub_feature_flags(refactor_mr_widget_test_summary: false) end -- cgit v1.2.3