Split tests into their own classes
This commit is contained in:
parent
cc69bd07e7
commit
8c0b619d40
4 changed files with 239 additions and 233 deletions
41
spec/lib/gitlab/email/email_shared_blocks.rb
Normal file
41
spec/lib/gitlab/email/email_shared_blocks.rb
Normal file
|
@ -0,0 +1,41 @@
|
|||
|
||||
shared_context :email_shared_context do
|
||||
let(:mail_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
|
||||
let(:receiver) { Gitlab::Email::Receiver.new(email_raw) }
|
||||
let(:markdown) { "![image](uploads/image.png)" }
|
||||
|
||||
def setup_attachment
|
||||
allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return(
|
||||
[
|
||||
{
|
||||
url: "uploads/image.png",
|
||||
is_image: true,
|
||||
alt: "image",
|
||||
markdown: markdown
|
||||
}
|
||||
]
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
shared_examples :email_shared_examples do
|
||||
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::UserNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the user is not authorized to the project" do
|
||||
before do
|
||||
project.update_attribute(:visibility_level, Project::PRIVATE)
|
||||
end
|
||||
|
||||
it "raises a ProjectNotFound" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::ProjectNotFound)
|
||||
end
|
||||
end
|
||||
end
|
79
spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
Normal file
79
spec/lib/gitlab/email/handler/create_issue_handler_spec.rb
Normal file
|
@ -0,0 +1,79 @@
|
|||
require 'spec_helper'
|
||||
require_relative '../email_shared_blocks'
|
||||
|
||||
describe Gitlab::Email::Handler::CreateIssueHandler, lib: true do
|
||||
include_context :email_shared_context
|
||||
it_behaves_like :email_shared_examples
|
||||
|
||||
before do
|
||||
stub_incoming_email_setting(enabled: true, address: "incoming+%{key}@appmail.adventuretime.ooo")
|
||||
stub_config_setting(host: 'localhost')
|
||||
end
|
||||
|
||||
let(:email_raw) { fixture_file('emails/valid_new_issue.eml') }
|
||||
let(:namespace) { create(:namespace, path: 'gitlabhq') }
|
||||
|
||||
let!(:project) { create(:project, :public, namespace: namespace) }
|
||||
let!(:user) do
|
||||
create(
|
||||
:user,
|
||||
email: 'jake@adventuretime.ooo',
|
||||
authentication_token: 'auth_token'
|
||||
)
|
||||
end
|
||||
|
||||
context "when everything is fine" do
|
||||
it "creates a new issue" do
|
||||
setup_attachment
|
||||
|
||||
expect { receiver.execute }.to change { project.issues.count }.by(1)
|
||||
issue = project.issues.last
|
||||
|
||||
expect(issue.author).to eq(user)
|
||||
expect(issue.title).to eq('New Issue by email')
|
||||
expect(issue.description).to include('reply by email')
|
||||
expect(issue.description).to include(markdown)
|
||||
end
|
||||
|
||||
context "when the reply is blank" do
|
||||
let(:email_raw) { fixture_file("emails/valid_new_issue_empty.eml") }
|
||||
|
||||
it "creates a new issue" do
|
||||
expect { receiver.execute }.to change { project.issues.count }.by(1)
|
||||
issue = project.issues.last
|
||||
|
||||
expect(issue.author).to eq(user)
|
||||
expect(issue.title).to eq('New Issue by email')
|
||||
expect(issue.description).to eq('')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "something is wrong" do
|
||||
context "when the issue could not be saved" do
|
||||
before do
|
||||
allow_any_instance_of(Issue).to receive(:persisted?).and_return(false)
|
||||
end
|
||||
|
||||
it "raises an InvalidIssueError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::InvalidIssueError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when we can't find the authentication_token" do
|
||||
let(:email_raw) { fixture_file("emails/wrong_authentication_token.eml") }
|
||||
|
||||
it "raises an UserNotFoundError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::UserNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when project is private" do
|
||||
let(:project) { create(:project, :private, namespace: namespace) }
|
||||
|
||||
it "raises a ProjectNotFound if the user is not a member" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::ProjectNotFound)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
116
spec/lib/gitlab/email/handler/create_note_handler_spec.rb
Normal file
116
spec/lib/gitlab/email/handler/create_note_handler_spec.rb
Normal file
|
@ -0,0 +1,116 @@
|
|||
require 'spec_helper'
|
||||
require_relative '../email_shared_blocks'
|
||||
|
||||
describe Gitlab::Email::Handler::CreateNoteHandler, lib: true do
|
||||
include_context :email_shared_context
|
||||
it_behaves_like :email_shared_examples
|
||||
|
||||
before do
|
||||
stub_incoming_email_setting(enabled: true, address: "reply+%{key}@appmail.adventuretime.ooo")
|
||||
stub_config_setting(host: 'localhost')
|
||||
end
|
||||
|
||||
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, mail_key) }
|
||||
|
||||
context "when the recipient address doesn't include a mail key" do
|
||||
let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(mail_key, "") }
|
||||
|
||||
it "raises a SentNotificationNotFoundError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::SentNotificationNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when no sent notification for the mail key could be found" do
|
||||
let(:email_raw) { fixture_file('emails/wrong_mail_key.eml') }
|
||||
|
||||
it "raises a SentNotificationNotFoundError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::SentNotificationNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the email was auto generated" do
|
||||
let!(:mail_key) { '636ca428858779856c226bb145ef4fad' }
|
||||
let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
|
||||
|
||||
it "raises an AutoGeneratedEmailError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::AutoGeneratedEmailError)
|
||||
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::NoteableNotFoundError)
|
||||
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::InvalidNoteError)
|
||||
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::EmptyEmailError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when everything is fine" do
|
||||
before do
|
||||
setup_attachment
|
||||
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 mail key' do |header|
|
||||
it "fetches the mail 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 'mail 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 mail key', 'References'
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -1,34 +1,8 @@
|
|||
require "spec_helper"
|
||||
require 'spec_helper'
|
||||
require_relative 'email_shared_blocks'
|
||||
|
||||
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(:mail_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, mail_key) }
|
||||
|
||||
let(:receiver) { described_class.new(email_raw) }
|
||||
let(:markdown) { "![image](uploads/image.png)" }
|
||||
|
||||
def setup_attachment
|
||||
allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return(
|
||||
[
|
||||
{
|
||||
url: "uploads/image.png",
|
||||
is_image: true,
|
||||
alt: "image",
|
||||
markdown: markdown
|
||||
}
|
||||
]
|
||||
)
|
||||
end
|
||||
include_context :email_shared_context
|
||||
|
||||
context "when we cannot find a capable handler" do
|
||||
let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(mail_key, "!!!") }
|
||||
|
@ -38,22 +12,6 @@ describe Gitlab::Email::Receiver, lib: true do
|
|||
end
|
||||
end
|
||||
|
||||
context "when the recipient address doesn't include a mail key" do
|
||||
let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(mail_key, "") }
|
||||
|
||||
it "raises a SentNotificationNotFoundError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::SentNotificationNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when no sent notification for the mail key could be found" do
|
||||
let(:email_raw) { fixture_file('emails/wrong_mail_key.eml') }
|
||||
|
||||
it "raises a SentNotificationNotFoundError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::SentNotificationNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the email is blank" do
|
||||
let(:email_raw) { "" }
|
||||
|
||||
|
@ -61,192 +19,4 @@ describe Gitlab::Email::Receiver, lib: true do
|
|||
expect { receiver.execute }.to raise_error(Gitlab::Email::EmptyEmailError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when the email was auto generated" do
|
||||
let!(:mail_key) { '636ca428858779856c226bb145ef4fad' }
|
||||
let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
|
||||
|
||||
it "raises an AutoGeneratedEmailError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::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::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::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 ProjectNotFound" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::ProjectNotFound)
|
||||
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::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::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::InvalidNoteError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when everything is fine" do
|
||||
before do
|
||||
setup_attachment
|
||||
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 mail key' do |header|
|
||||
it "fetches the mail 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 'mail 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 mail key', 'References'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "when it's trying to create a new issue" do
|
||||
before do
|
||||
stub_incoming_email_setting(enabled: true, address: "incoming+%{key}@appmail.adventuretime.ooo")
|
||||
end
|
||||
|
||||
let(:sent_notification) {}
|
||||
let!(:user) do
|
||||
create(
|
||||
:user,
|
||||
email: 'jake@adventuretime.ooo',
|
||||
authentication_token: 'auth_token'
|
||||
)
|
||||
end
|
||||
let(:namespace) { create(:namespace, path: 'gitlabhq') }
|
||||
let(:project) { create(:project, :public, namespace: namespace) }
|
||||
let(:email_raw) { fixture_file('emails/valid_new_issue.eml') }
|
||||
|
||||
context "when everything is fine" do
|
||||
it "creates a new issue" do
|
||||
setup_attachment
|
||||
|
||||
expect { receiver.execute }.to change { project.issues.count }.by(1)
|
||||
issue = project.issues.last
|
||||
|
||||
expect(issue.author).to eq(user)
|
||||
expect(issue.title).to eq('New Issue by email')
|
||||
expect(issue.description).to include('reply by email')
|
||||
expect(issue.description).to include(markdown)
|
||||
end
|
||||
|
||||
context "when the reply is blank" do
|
||||
let!(:email_raw) { fixture_file("emails/valid_new_issue_empty.eml") }
|
||||
|
||||
it "creates a new issue" do
|
||||
expect { receiver.execute }.to change { project.issues.count }.by(1)
|
||||
issue = project.issues.last
|
||||
|
||||
expect(issue.author).to eq(user)
|
||||
expect(issue.title).to eq('New Issue by email')
|
||||
expect(issue.description).to eq('')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "something is wrong" do
|
||||
before do
|
||||
project
|
||||
end
|
||||
|
||||
context "when the issue could not be saved" do
|
||||
before do
|
||||
allow_any_instance_of(Issue).to receive(:persisted?).and_return(false)
|
||||
end
|
||||
|
||||
it "raises an InvalidIssueError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::InvalidIssueError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when we can't find the authentication_token" do
|
||||
let!(:email_raw) { fixture_file("emails/wrong_authentication_token.eml") }
|
||||
|
||||
it "raises an UserNotFoundError" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::UserNotFoundError)
|
||||
end
|
||||
end
|
||||
|
||||
context "when project is private" do
|
||||
let(:project) { create(:project, :private, namespace: namespace) }
|
||||
|
||||
it "raises a ProjectNotFound if the user is not a member" do
|
||||
expect { receiver.execute }.to raise_error(Gitlab::Email::ProjectNotFound)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue