9f218fc184
A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
164 lines
4.9 KiB
Ruby
164 lines
4.9 KiB
Ruby
require "spec_helper"
|
|
|
|
describe Gitlab::Email::Receiver, lib: true do
|
|
before do
|
|
stub_incoming_email_setting(enabled: true, address: "reply+%{key}@appmail.adventuretime.ooo")
|
|
stub_config_setting(host: 'localhost')
|
|
end
|
|
|
|
let(:reply_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
|
|
let(:email_raw) { fixture_file('emails/valid_reply.eml') }
|
|
|
|
let(:project) { create(:project, :public) }
|
|
let(:noteable) { create(:issue, project: project) }
|
|
let(:user) { create(:user) }
|
|
let!(:sent_notification) { SentNotification.record(noteable, user.id, reply_key) }
|
|
|
|
let(:receiver) { described_class.new(email_raw) }
|
|
|
|
context "when the recipient address doesn't include a reply key" do
|
|
let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(reply_key, "") }
|
|
|
|
it "raises a SentNotificationNotFoundError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::SentNotificationNotFoundError)
|
|
end
|
|
end
|
|
|
|
context "when no sent notificiation for the reply key could be found" do
|
|
let(:email_raw) { fixture_file('emails/wrong_reply_key.eml') }
|
|
|
|
it "raises a SentNotificationNotFoundError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::SentNotificationNotFoundError)
|
|
end
|
|
end
|
|
|
|
context "when the email is blank" do
|
|
let(:email_raw) { "" }
|
|
|
|
it "raises an EmptyEmailError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::EmptyEmailError)
|
|
end
|
|
end
|
|
|
|
context "when the email was auto generated" do
|
|
let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
|
|
let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
|
|
|
|
it "raises an AutoGeneratedEmailError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::AutoGeneratedEmailError)
|
|
end
|
|
end
|
|
|
|
context "when the user could not be found" do
|
|
before do
|
|
user.destroy
|
|
end
|
|
|
|
it "raises a UserNotFoundError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::UserNotFoundError)
|
|
end
|
|
end
|
|
|
|
context "when the user has been blocked" do
|
|
before do
|
|
user.block
|
|
end
|
|
|
|
it "raises a UserBlockedError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::UserBlockedError)
|
|
end
|
|
end
|
|
|
|
context "when the user is not authorized to create a note" do
|
|
before do
|
|
project.update_attribute(:visibility_level, Project::PRIVATE)
|
|
end
|
|
|
|
it "raises a UserNotAuthorizedError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::UserNotAuthorizedError)
|
|
end
|
|
end
|
|
|
|
context "when the noteable could not be found" do
|
|
before do
|
|
noteable.destroy
|
|
end
|
|
|
|
it "raises a NoteableNotFoundError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::NoteableNotFoundError)
|
|
end
|
|
end
|
|
|
|
context "when the reply is blank" do
|
|
let!(:email_raw) { fixture_file("emails/no_content_reply.eml") }
|
|
|
|
it "raises an EmptyEmailError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::EmptyEmailError)
|
|
end
|
|
end
|
|
|
|
context "when the note could not be saved" do
|
|
before do
|
|
allow_any_instance_of(Note).to receive(:persisted?).and_return(false)
|
|
end
|
|
|
|
it "raises an InvalidNoteError" do
|
|
expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::InvalidNoteError)
|
|
end
|
|
end
|
|
|
|
context "when everything is fine" do
|
|
let(:markdown) { "![image](uploads/image.png)" }
|
|
|
|
before do
|
|
allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return(
|
|
[
|
|
{
|
|
url: "uploads/image.png",
|
|
is_image: true,
|
|
alt: "image",
|
|
markdown: markdown
|
|
}
|
|
]
|
|
)
|
|
end
|
|
|
|
it "creates a comment" do
|
|
expect { receiver.execute }.to change { noteable.notes.count }.by(1)
|
|
note = noteable.notes.last
|
|
|
|
expect(note.author).to eq(sent_notification.recipient)
|
|
expect(note.note).to include("I could not disagree more.")
|
|
end
|
|
|
|
it "adds all attachments" do
|
|
receiver.execute
|
|
|
|
note = noteable.notes.last
|
|
|
|
expect(note.note).to include(markdown)
|
|
end
|
|
|
|
context 'when sub-addressing is not supported' do
|
|
before do
|
|
stub_incoming_email_setting(enabled: true, address: nil)
|
|
end
|
|
|
|
shared_examples 'an email that contains a reply key' do |header|
|
|
it "fetches the reply key from the #{header} header and creates a comment" do
|
|
expect { receiver.execute }.to change { noteable.notes.count }.by(1)
|
|
note = noteable.notes.last
|
|
|
|
expect(note.author).to eq(sent_notification.recipient)
|
|
expect(note.note).to include('I could not disagree more.')
|
|
end
|
|
end
|
|
|
|
context 'reply key is in the References header' do
|
|
let(:email_raw) { fixture_file('emails/reply_without_subaddressing_and_key_inside_references.eml') }
|
|
|
|
it_behaves_like 'an email that contains a reply key', 'References'
|
|
end
|
|
end
|
|
end
|
|
end
|