Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 0 deletions

diff --git a/spec/features/groups/integrations/group_integrations_spec.rb b/spec/features/groups/integrations/group_integrations_spec.rb
index 0d65fa5964b..8cddda91e89 100644
--- a/spec/features/groups/integrations/group_integrations_spec.rb
+++ b/spec/features/groups/integrations/group_integrations_spec.rb
@@ -5,6 +5,10 @@ require 'spec_helper'
 RSpec.describe 'Group integrations', :js do
   include_context 'group integration activation'
 
+  before do
+    stub_feature_flags(remove_monitor_metrics: false)
+  end
+
   it_behaves_like 'integration settings form' do
     let(:integrations) { Integration.find_or_initialize_all_non_project_specific(Integration.for_group(group)) }
 
@@ -12,4 +16,16 @@ RSpec.describe 'Group integrations', :js do
       visit_group_integration(integration.title)
     end
   end
+
+  context 'with remove_monitor_metrics flag enabled' do
+    before do
+      stub_feature_flags(remove_monitor_metrics: true)
+    end
+
+    it 'returns a 404 for the prometheus edit page' do
+      visit edit_group_settings_integration_path(group, :prometheus)
+
+      expect(page).to have_content "Page Not Found"
+    end
+  end
 end