Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 7 insertions, 23 deletions

diff --git a/spec/workers/mail_scheduler/notification_service_worker_spec.rb b/spec/workers/mail_scheduler/notification_service_worker_spec.rb
index 3c17025c152..482d99a43c2 100644
--- a/spec/workers/mail_scheduler/notification_service_worker_spec.rb
+++ b/spec/workers/mail_scheduler/notification_service_worker_spec.rb
@@ -53,31 +53,15 @@ RSpec.describe MailScheduler::NotificationServiceWorker do
     end
 
     context 'when the method is not allowed' do
-      context 'when verify_mail_scheduler_notification_service_worker_method_names is enabled' do
-        it 'raises ArgumentError' do
-          expect(worker.notification_service).not_to receive(:async)
-          expect(worker.notification_service).not_to receive(:foo)
+      it 'raises ArgumentError' do
+        expect(worker.notification_service).not_to receive(:async)
+        expect(worker.notification_service).not_to receive(:foo)
 
-          expect { worker.perform('async', *serialize(key)) }
-            .to raise_error(ArgumentError, 'async not allowed for MailScheduler::NotificationServiceWorker')
+        expect { worker.perform('async', *serialize(key)) }
+          .to raise_error(ArgumentError, 'async not allowed for MailScheduler::NotificationServiceWorker')
 
-          expect { worker.perform('foo', *serialize(key)) }
-            .to raise_error(ArgumentError, 'foo not allowed for MailScheduler::NotificationServiceWorker')
-        end
-      end
-
-      context 'when verify_mail_scheduler_notification_service_worker_method_names is disabled' do
-        before do
-          stub_feature_flags(verify_mail_scheduler_notification_service_worker_method_names: false)
-        end
-
-        it 'forwards the argument to the service' do
-          expect(worker.notification_service).to receive(:async)
-          expect(worker.notification_service).to receive(:foo)
-
-          worker.perform('async', *serialize(key))
-          worker.perform('foo', *serialize(key))
-        end
+        expect { worker.perform('foo', *serialize(key)) }
+          .to raise_error(ArgumentError, 'foo not allowed for MailScheduler::NotificationServiceWorker')
       end
     end
   end