3d7194f011
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
68 lines
1.7 KiB
Ruby
68 lines
1.7 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe UsersProjectObserver do
|
|
before(:each) { enable_observers }
|
|
after(:each) { disable_observers }
|
|
|
|
let(:user) { create(:user) }
|
|
let(:project) { create(:project) }
|
|
subject { UsersProjectObserver.instance }
|
|
before { subject.stub(notification: mock('NotificationService').as_null_object) }
|
|
|
|
describe "#after_commit" do
|
|
it "should called when UsersProject created" do
|
|
subject.should_receive(:after_commit)
|
|
create(:users_project)
|
|
end
|
|
|
|
it "should send email to user" do
|
|
subject.should_receive(:notification)
|
|
Event.stub(create: true)
|
|
|
|
create(:users_project)
|
|
end
|
|
|
|
it "should create new event" do
|
|
Event.should_receive(:create)
|
|
|
|
create(:users_project)
|
|
end
|
|
end
|
|
|
|
describe "#after_update" do
|
|
before do
|
|
@users_project = create :users_project
|
|
end
|
|
|
|
it "should called when UsersProject updated" do
|
|
subject.should_receive(:after_commit)
|
|
@users_project.update_attribute(:project_access, UsersProject::MASTER)
|
|
end
|
|
|
|
it "should send email to user" do
|
|
subject.should_receive(:notification)
|
|
@users_project.update_attribute(:project_access, UsersProject::MASTER)
|
|
end
|
|
|
|
it "should not called after UsersProject destroyed" do
|
|
subject.should_not_receive(:after_commit)
|
|
@users_project.destroy
|
|
end
|
|
end
|
|
|
|
describe "#after_destroy" do
|
|
before do
|
|
@users_project = create :users_project
|
|
end
|
|
|
|
it "should called when UsersProject destroyed" do
|
|
subject.should_receive(:after_destroy)
|
|
@users_project.destroy
|
|
end
|
|
|
|
it "should create new event" do
|
|
Event.should_receive(:create)
|
|
@users_project.destroy
|
|
end
|
|
end
|
|
end
|