Commit 267b18de authored by Riyad Preukschas's avatar Riyad Preukschas

Add specs for exporting merge requests as diff or patch

parent b3834bc9
require 'spec_helper'
describe MergeRequestsController do
let(:project) { create(:project) }
let(:user) { create(:user) }
let(:merge_request) { create(:merge_request_with_diffs, project: project) }
before do
sign_in(user)
project.add_access(user, :read, :admin)
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('&amp;')
expect(response.body).to_not include('&gt;')
expect(response.body).to_not include('&lt;')
expect(response.body).to_not include('&quot;')
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
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
...@@ -63,7 +63,22 @@ FactoryGirl.define do ...@@ -63,7 +63,22 @@ FactoryGirl.define do
closed true closed true
end end
# pick 3 commits "at random" (from bcf03b5d~3 to bcf03b5d)
trait :with_diffs do
target_branch "bcf03b5d~3"
source_branch "bcf03b5d"
st_commits do
[Commit.new(project.repo.commit('bcf03b5d')),
Commit.new(project.repo.commit('bcf03b5d~1')),
Commit.new(project.repo.commit('bcf03b5d~2'))]
end
st_diffs do
project.repo.diff("bcf03b5d~3", "bcf03b5d")
end
end
factory :closed_merge_request, traits: [:closed] factory :closed_merge_request, traits: [:closed]
factory :merge_request_with_diffs, traits: [:with_diffs]
end end
factory :note do factory :note do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment