Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 31 insertions, 3 deletions

diff --git a/spec/lib/gitlab/email/service_desk_receiver_spec.rb b/spec/lib/gitlab/email/service_desk_receiver_spec.rb
index 6ba58ad5e93..49cbec6fffc 100644
--- a/spec/lib/gitlab/email/service_desk_receiver_spec.rb
+++ b/spec/lib/gitlab/email/service_desk_receiver_spec.rb
@@ -9,9 +9,7 @@ RSpec.describe Gitlab::Email::ServiceDeskReceiver do
   context 'when the email contains a valid email address' do
     before do
       stub_service_desk_email_setting(enabled: true, address: 'support+%{key}@example.com')
-    end
 
-    it 'finds the service desk key' do
       handler = double(execute: true, metrics_event: true, metrics_params: true)
       expected_params = [
         an_instance_of(Mail::Message), nil,
@@ -20,8 +18,38 @@ RSpec.describe Gitlab::Email::ServiceDeskReceiver do
 
       expect(Gitlab::Email::Handler::ServiceDeskHandler)
         .to receive(:new).with(*expected_params).and_return(handler)
+    end
+
+    context 'when in a To header' do
+      it 'finds the service desk key' do
+        receiver.execute
+      end
+    end
+
+    context 'when the email contains a valid email address in a header' do
+      context 'when in a Delivered-To header' do
+        let(:email) { fixture_file('emails/service_desk_custom_address_reply.eml') }
+
+        it 'finds the service desk key' do
+          receiver.execute
+        end
+      end
+
+      context 'when in a Envelope-To header' do
+        let(:email) { fixture_file('emails/service_desk_custom_address_envelope_to.eml') }
+
+        it 'finds the service desk key' do
+          receiver.execute
+        end
+      end
+
+      context 'when in a X-Envelope-To header' do
+        let(:email) { fixture_file('emails/service_desk_custom_address_x_envelope_to.eml') }
 
-      receiver.execute
+        it 'finds the service desk key' do
+          receiver.execute
+        end
+      end
     end
   end