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
67 lines
1.7 KiB
Ruby
67 lines
1.7 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: forked_project_links
|
|
#
|
|
# id :integer not null, primary key
|
|
# forked_to_project_id :integer not null
|
|
# forked_from_project_id :integer not null
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
#
|
|
|
|
require 'spec_helper'
|
|
|
|
describe ForkedProjectLink, "add link on fork" do
|
|
let(:project_from) { create(:project) }
|
|
let(:namespace) { create(:namespace) }
|
|
let(:user) { create(:user, namespace: namespace) }
|
|
|
|
before do
|
|
@project_to = fork_project(project_from, user)
|
|
end
|
|
|
|
it "project_to should know it is forked" do
|
|
@project_to.forked?.should be_true
|
|
end
|
|
|
|
it "project should know who it is forked from" do
|
|
@project_to.forked_from_project.should == project_from
|
|
end
|
|
end
|
|
|
|
describe :forked_from_project do
|
|
let(:forked_project_link) { build(:forked_project_link) }
|
|
let(:project_from) { create(:project) }
|
|
let(:project_to) { create(:project, forked_project_link: forked_project_link) }
|
|
|
|
|
|
before :each do
|
|
forked_project_link.forked_from_project = project_from
|
|
forked_project_link.forked_to_project = project_to
|
|
forked_project_link.save!
|
|
end
|
|
|
|
|
|
it "project_to should know it is forked" do
|
|
project_to.forked?.should be_true
|
|
end
|
|
|
|
it "project_from should not be forked" do
|
|
project_from.forked?.should be_false
|
|
end
|
|
|
|
it "project_to.destroy should destroy fork_link" do
|
|
forked_project_link.should_receive(:destroy)
|
|
project_to.destroy
|
|
end
|
|
|
|
end
|
|
|
|
def fork_project(from_project, user)
|
|
context = Projects::ForkContext.new(from_project, user)
|
|
shell = mock("gitlab_shell")
|
|
shell.stub(fork_repository: true)
|
|
context.stub(gitlab_shell: shell)
|
|
context.execute
|
|
end
|
|
|