2012-11-25 00:04:13 +01:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
describe MergeRequestsController do
|
2013-04-01 17:16:08 +02:00
|
|
|
let(:project) { create(:project_with_code) }
|
2012-11-25 00:04:13 +01:00
|
|
|
let(:user) { create(:user) }
|
2013-01-15 18:18:52 +01:00
|
|
|
let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") }
|
2012-11-25 00:04:13 +01:00
|
|
|
|
|
|
|
before do
|
|
|
|
sign_in(user)
|
2013-01-04 17:50:31 +01:00
|
|
|
project.team << [user, :master]
|
2012-11-26 13:44:29 +01:00
|
|
|
MergeRequestsController.any_instance.stub(validates_merge_request: true)
|
2012-11-25 00:04:13 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "#show" do
|
|
|
|
shared_examples "export 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}"))
|
|
|
|
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 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 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
|
|
|
|
|
2012-11-26 13:44:29 +01:00
|
|
|
# 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
|
2012-11-25 00:04:13 +01:00
|
|
|
|
2012-11-26 13:44:29 +01:00
|
|
|
#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
|
2012-11-25 00:04:13 +01:00
|
|
|
|
|
|
|
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
|