Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 1 insertions, 14 deletions

diff --git a/spec/features/alerts_settings/user_views_alerts_settings_spec.rb b/spec/features/alerts_settings/user_views_alerts_settings_spec.rb
index 0ded13ae607..698a36d3f76 100644
--- a/spec/features/alerts_settings/user_views_alerts_settings_spec.rb
+++ b/spec/features/alerts_settings/user_views_alerts_settings_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe 'Alert integrations settings form', :js do
   end
 
   describe 'when viewing alert integrations as a maintainer' do
-    context 'with feature flag enabled' do
+    context 'with the default page permissions' do
       before do
         visit project_settings_operations_path(project, anchor: 'js-alert-management-settings')
         wait_for_requests
@@ -33,19 +33,6 @@ RSpec.describe 'Alert integrations settings form', :js do
         expect(page).to have_content('1. Select integration type')
       end
     end
-
-    context 'with feature flag disabled' do
-      before do
-        stub_feature_flags(http_integrations_list: false)
-
-        visit project_settings_operations_path(project, anchor: 'js-alert-management-settings')
-        wait_for_requests
-      end
-
-      it 'shows the old alerts setting form' do
-        expect(page).to have_content('Webhook URL')
-      end
-    end
   end
 
   describe 'when viewing alert integrations as a developer' do