3e259ea8bc
This reverts commit5daf44b7c8
, reversing changes made to2f706fbd23
.
39 lines
1.1 KiB
Ruby
39 lines
1.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe MergeRequests::MergeService do
|
|
let(:user) { create(:user) }
|
|
let(:user2) { create(:user) }
|
|
let(:merge_request) { create(:merge_request, assignee: user2) }
|
|
let(:project) { merge_request.project }
|
|
|
|
before do
|
|
project.team << [user, :master]
|
|
project.team << [user2, :developer]
|
|
end
|
|
|
|
describe :execute do
|
|
context 'valid params' do
|
|
let(:service) { MergeRequests::MergeService.new(project, user, {}) }
|
|
|
|
before do
|
|
allow(service).to receive(:execute_hooks)
|
|
|
|
service.execute(merge_request, 'Awesome message')
|
|
end
|
|
|
|
it { expect(merge_request).to be_valid }
|
|
it { expect(merge_request).to be_merged }
|
|
|
|
it 'should send email to user2 about merge of new merge_request' do
|
|
email = ActionMailer::Base.deliveries.last
|
|
expect(email.to.first).to eq(user2.email)
|
|
expect(email.subject).to include(merge_request.title)
|
|
end
|
|
|
|
it 'should create system note about merge_request merge' do
|
|
note = merge_request.notes.last
|
|
expect(note.note).to include 'Status changed to merged'
|
|
end
|
|
end
|
|
end
|
|
end
|