summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-01 16:11:11 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-01 16:11:11 +0000
commit45f3b0b779b828c8afe4fcb1d0749266416f6b9e (patch)
tree47e83296a4d07ea404b8030409045ee69712c05c /spec/lib
parent2b7e31825df4409742c545d15884ef18067aad5e (diff)
parent08b1380ff712f46a6005d366a9159a3e81674fb7 (diff)
downloadgitlab-ce-45f3b0b779b828c8afe4fcb1d0749266416f6b9e.tar.gz
Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master'
Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/gitlab/email/receiver_spec.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index 2a86b427806..f127e45ae6a 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -7,9 +7,17 @@ describe Gitlab::Email::Receiver, lib: true do
context "when we cannot find a capable handler" do
let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(mail_key, "!!!") }
- it "raises a UnknownIncomingEmail" do
+ it "raises an UnknownIncomingEmail error" do
expect { receiver.execute }.to raise_error(Gitlab::Email::UnknownIncomingEmail)
end
+
+ context "and the email contains no references header" do
+ let(:email_raw) { fixture_file("emails/auto_reply.eml").gsub(mail_key, "!!!") }
+
+ it "raises an UnknownIncomingEmail error" do
+ expect { receiver.execute }.to raise_error(Gitlab::Email::UnknownIncomingEmail)
+ end
+ end
end
context "when the email is blank" do