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
85 lines
2.9 KiB
Ruby
85 lines
2.9 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Projects::MergeRequestsController do
|
|
let(:project) { create(:project_with_code) }
|
|
let(:user) { create(:user) }
|
|
let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") }
|
|
|
|
before do
|
|
sign_in(user)
|
|
project.team << [user, :master]
|
|
Projects::MergeRequestsController.any_instance.stub(validates_merge_request: true)
|
|
end
|
|
|
|
describe "#show" do
|
|
shared_examples "export merge as" do |format|
|
|
it "should generally work" do
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
expect(response).to be_success
|
|
end
|
|
|
|
it "should generate it" do
|
|
MergeRequest.any_instance.should_receive(:"to_#{format}")
|
|
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
end
|
|
|
|
it "should render it" do
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
expect(response.body).to eq((merge_request.send(:"to_#{format}",user)).to_s)
|
|
end
|
|
|
|
it "should not escape Html" do
|
|
MergeRequest.any_instance.stub(:"to_#{format}").and_return('HTML entities &<>" ')
|
|
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
expect(response.body).to_not include('&')
|
|
expect(response.body).to_not include('>')
|
|
expect(response.body).to_not include('<')
|
|
expect(response.body).to_not include('"')
|
|
end
|
|
end
|
|
|
|
describe "as diff" do
|
|
include_examples "export merge as", :diff
|
|
let(:format) { :diff }
|
|
|
|
it "should really only be a git diff" do
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
expect(response.body).to start_with("diff --git")
|
|
end
|
|
end
|
|
|
|
describe "as patch" do
|
|
include_examples "export merge as", :patch
|
|
let(:format) { :patch }
|
|
|
|
it "should really be a git email patch with commit" do
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
expect(response.body[0..100]).to start_with("From #{merge_request.commits.last.id}")
|
|
end
|
|
|
|
# TODO: fix or remove
|
|
#it "should contain as many patches as there are commits" do
|
|
#get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
#patch_count = merge_request.commits.count
|
|
#merge_request.commits.each_with_index do |commit, patch_num|
|
|
#expect(response.body).to match(/^From #{commit.id}/)
|
|
#expect(response.body).to match(/^Subject: \[PATCH #{patch_num}\/#{patch_count}\]/)
|
|
#end
|
|
#end
|
|
|
|
it "should contain git diffs" do
|
|
get :show, project_id: project.code, id: merge_request.id, format: format
|
|
|
|
expect(response.body).to match(/^diff --git/)
|
|
end
|
|
end
|
|
end
|
|
end
|