489fa5d726
-Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
118 lines
3.8 KiB
Ruby
118 lines
3.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe MergeRequestObserver do
|
|
let(:some_user) { create :user }
|
|
let(:assignee) { create :user }
|
|
let(:author) { create :user }
|
|
let(:mr_mock) { double(:merge_request, id: 42, assignee: assignee, author: author) }
|
|
let(:assigned_mr) { create(:merge_request, assignee: assignee, author: author) }
|
|
let(:unassigned_mr) { create(:merge_request, author: author) }
|
|
let(:closed_assigned_mr) { create(:closed_merge_request, assignee: assignee, author: author) }
|
|
let(:closed_unassigned_mr) { create(:closed_merge_request, author: author) }
|
|
|
|
before { subject.stub(:current_user).and_return(some_user) }
|
|
before { subject.stub(notification: mock('NotificationService').as_null_object) }
|
|
before { mr_mock.stub(:author_id) }
|
|
before { mr_mock.stub(:target_project) }
|
|
before(:each) { enable_observers }
|
|
after(:each) { disable_observers }
|
|
|
|
subject { MergeRequestObserver.instance }
|
|
|
|
describe '#after_create' do
|
|
it 'trigger notification service' do
|
|
subject.should_receive(:notification)
|
|
subject.after_create(mr_mock)
|
|
end
|
|
end
|
|
|
|
context '#after_update' do
|
|
before(:each) do
|
|
mr_mock.stub(:is_being_reassigned?).and_return(false)
|
|
end
|
|
|
|
it 'is called when a merge request is changed' do
|
|
changed = create(:merge_request, source_project: create(:project))
|
|
subject.should_receive(:after_update)
|
|
|
|
MergeRequest.observers.enable :merge_request_observer do
|
|
changed.title = 'I changed'
|
|
changed.save
|
|
end
|
|
end
|
|
|
|
context 'a notification' do
|
|
it 'is sent if the merge request is being reassigned' do
|
|
mr_mock.should_receive(:is_being_reassigned?).and_return(true)
|
|
subject.should_receive(:notification)
|
|
|
|
subject.after_update(mr_mock)
|
|
end
|
|
|
|
it 'is not sent if the merge request is not being reassigned' do
|
|
mr_mock.should_receive(:is_being_reassigned?).and_return(false)
|
|
subject.should_not_receive(:notification)
|
|
|
|
subject.after_update(mr_mock)
|
|
end
|
|
end
|
|
end
|
|
|
|
context '#after_close' do
|
|
context 'a status "closed"' do
|
|
it 'note is created if the merge request is being closed' do
|
|
Note.should_receive(:create_status_change_note).with(assigned_mr, assigned_mr.target_project, some_user, 'closed')
|
|
|
|
assigned_mr.close
|
|
end
|
|
|
|
it 'notification is delivered only to author if the merge request is being closed' do
|
|
Note.should_receive(:create_status_change_note).with(unassigned_mr, unassigned_mr.target_project, some_user, 'closed')
|
|
|
|
unassigned_mr.close
|
|
end
|
|
end
|
|
end
|
|
|
|
context '#after_reopen' do
|
|
context 'a status "reopened"' do
|
|
it 'note is created if the merge request is being reopened' do
|
|
Note.should_receive(:create_status_change_note).with(closed_assigned_mr, closed_assigned_mr.target_project, some_user, 'reopened')
|
|
|
|
closed_assigned_mr.reopen
|
|
end
|
|
|
|
it 'notification is delivered only to author if the merge request is being reopened' do
|
|
Note.should_receive(:create_status_change_note).with(closed_unassigned_mr, closed_unassigned_mr.target_project, some_user, 'reopened')
|
|
|
|
closed_unassigned_mr.reopen
|
|
end
|
|
end
|
|
end
|
|
|
|
|
|
describe "Merge Request created" do
|
|
def self.it_should_be_valid_event
|
|
it { @event.should_not be_nil }
|
|
it { @event.should_not be_nil }
|
|
it { @event.project.should == project }
|
|
it { @event.project.should == project }
|
|
end
|
|
|
|
let(:project) { create(:project) }
|
|
before do
|
|
TestEnv.enable_observers
|
|
@merge_request = create(:merge_request, source_project: project, target_project: project)
|
|
@event = Event.last
|
|
end
|
|
|
|
after do
|
|
TestEnv.disable_observers
|
|
end
|
|
|
|
it_should_be_valid_event
|
|
it { @event.action.should == Event::CREATED }
|
|
it { @event.target.should == @merge_request }
|
|
end
|
|
|
|
end
|