Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 0 insertions, 11 deletions

diff --git a/spec/services/service_desk/custom_emails/destroy_service_spec.rb b/spec/services/service_desk/custom_emails/destroy_service_spec.rb
index 7f53a941d4e..d77e408c31b 100644
--- a/spec/services/service_desk/custom_emails/destroy_service_spec.rb
+++ b/spec/services/service_desk/custom_emails/destroy_service_spec.rb
@@ -8,7 +8,6 @@ RSpec.describe ServiceDesk::CustomEmails::DestroyService, feature_category: :ser
 
     let(:user) { build_stubbed(:user) }
     let(:service) { described_class.new(project: project, current_user: user) }
-    let(:error_feature_flag_disabled) { 'Feature flag service_desk_custom_email is not enabled' }
     let(:error_user_not_authorized) { s_('ServiceDesk|User cannot manage project.') }
     let(:error_does_not_exist) { s_('ServiceDesk|Custom email does not exist') }
     let(:expected_error_message) { nil }
@@ -45,16 +44,6 @@ RSpec.describe ServiceDesk::CustomEmails::DestroyService, feature_category: :ser
       end
     end
 
-    context 'when feature flag service_desk_custom_email is disabled' do
-      let(:expected_error_message) { error_feature_flag_disabled }
-
-      before do
-        stub_feature_flags(service_desk_custom_email: false)
-      end
-
-      it_behaves_like 'a service that exits with error'
-    end
-
     context 'with illegitimate user' do
       let(:expected_error_message) { error_user_not_authorized }