2012-11-24 18:05:11 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2013-06-23 13:25:06 -04:00
|
|
|
describe Projects::CommitController do
|
2014-01-22 14:03:52 -05:00
|
|
|
let(:project) { create(:project) }
|
2012-11-24 18:05:11 -05:00
|
|
|
let(:user) { create(:user) }
|
2015-04-21 09:13:40 -04:00
|
|
|
let(:commit) { project.commit("master") }
|
2016-04-18 03:39:07 -04:00
|
|
|
let(:master_pickable_sha) { '7d3b0f7cff5f37573aea97cebfd5692ea1689924' }
|
|
|
|
let(:master_pickable_commit) { project.commit(master_pickable_sha) }
|
2012-11-24 18:05:11 -05:00
|
|
|
|
|
|
|
before do
|
|
|
|
sign_in(user)
|
2013-01-04 11:50:31 -05:00
|
|
|
project.team << [user, :master]
|
2012-11-24 18:05:11 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "#show" do
|
|
|
|
shared_examples "export as" do |format|
|
|
|
|
it "should generally work" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id,
|
|
|
|
format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
|
|
|
|
expect(response).to be_success
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should generate it" do
|
2015-02-12 13:17:35 -05:00
|
|
|
expect_any_instance_of(Commit).to receive(:"to_#{format}")
|
2012-11-24 18:05:11 -05:00
|
|
|
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id, format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it "should render it" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id, format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
|
|
|
|
expect(response.body).to eq(commit.send(:"to_#{format}"))
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should not escape Html" do
|
2015-02-12 13:53:23 -05:00
|
|
|
allow_any_instance_of(Commit).to receive(:"to_#{format}").
|
|
|
|
and_return('HTML entities &<>" ')
|
2012-11-24 18:05:11 -05:00
|
|
|
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id, format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
|
2015-06-17 21:30:58 -04:00
|
|
|
expect(response.body).not_to include('&')
|
|
|
|
expect(response.body).not_to include('>')
|
|
|
|
expect(response.body).not_to include('<')
|
|
|
|
expect(response.body).not_to include('"')
|
2012-11-24 18:05:11 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe "as diff" do
|
|
|
|
include_examples "export as", :diff
|
|
|
|
let(:format) { :diff }
|
|
|
|
|
|
|
|
it "should really only be a git diff" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id,
|
|
|
|
format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
|
|
|
|
expect(response.body).to start_with("diff --git")
|
|
|
|
end
|
2015-11-30 04:30:44 -05:00
|
|
|
|
|
|
|
it "should really only be a git diff without whitespace changes" do
|
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: '66eceea0db202bb39c4e445e8ca28689645366c5',
|
|
|
|
# id: commit.id,
|
|
|
|
format: format,
|
|
|
|
w: 1)
|
|
|
|
|
|
|
|
expect(response.body).to start_with("diff --git")
|
|
|
|
# without whitespace option, there are more than 2 diff_splits
|
2016-03-03 12:38:44 -05:00
|
|
|
diff_splits = assigns(:diffs).first.diff.split("\n")
|
2015-11-30 04:30:44 -05:00
|
|
|
expect(diff_splits.length).to be <= 2
|
|
|
|
end
|
2012-11-24 18:05:11 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
describe "as patch" do
|
|
|
|
include_examples "export as", :patch
|
|
|
|
let(:format) { :patch }
|
|
|
|
|
|
|
|
it "should really be a git email patch" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id,
|
|
|
|
format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
|
|
|
|
expect(response.body).to start_with("From #{commit.id}")
|
|
|
|
end
|
|
|
|
|
|
|
|
it "should contain a git diff" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id,
|
|
|
|
format: format)
|
2012-11-24 18:05:11 -05:00
|
|
|
|
|
|
|
expect(response.body).to match(/^diff --git/)
|
|
|
|
end
|
|
|
|
end
|
2015-12-04 14:31:01 -05:00
|
|
|
|
|
|
|
context 'commit that removes a submodule' do
|
|
|
|
render_views
|
|
|
|
|
|
|
|
let(:fork_project) { create(:forked_project_with_submodules) }
|
|
|
|
let(:commit) { fork_project.commit('remove-submodule') }
|
|
|
|
|
|
|
|
before do
|
|
|
|
fork_project.team << [user, :master]
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'renders it' do
|
|
|
|
get(:show,
|
|
|
|
namespace_id: fork_project.namespace.to_param,
|
|
|
|
project_id: fork_project.to_param,
|
|
|
|
id: commit.id)
|
|
|
|
|
|
|
|
expect(response).to be_success
|
|
|
|
end
|
|
|
|
end
|
2012-11-24 18:05:11 -05:00
|
|
|
end
|
2015-02-03 00:30:11 -05:00
|
|
|
|
|
|
|
describe "#branches" do
|
|
|
|
it "contains branch and tags information" do
|
2015-06-23 01:24:39 -04:00
|
|
|
get(:branches,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id)
|
2015-02-03 00:30:11 -05:00
|
|
|
|
|
|
|
expect(assigns(:branches)).to include("master", "feature_conflict")
|
|
|
|
expect(assigns(:tags)).to include("v1.1.0")
|
|
|
|
end
|
|
|
|
end
|
2016-02-10 18:02:46 -05:00
|
|
|
|
|
|
|
describe '#revert' do
|
|
|
|
context 'when target branch is not provided' do
|
|
|
|
it 'should render the 404 page' do
|
|
|
|
post(:revert,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: commit.id)
|
|
|
|
|
|
|
|
expect(response).not_to be_success
|
|
|
|
expect(response.status).to eq(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the revert was successful' do
|
|
|
|
it 'should redirect to the commits page' do
|
|
|
|
post(:revert,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
target_branch: 'master',
|
|
|
|
id: commit.id)
|
|
|
|
|
|
|
|
expect(response).to redirect_to namespace_project_commits_path(project.namespace, project, 'master')
|
|
|
|
expect(flash[:notice]).to eq('The commit has been successfully reverted.')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the revert failed' do
|
|
|
|
before do
|
|
|
|
post(:revert,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
target_branch: 'master',
|
|
|
|
id: commit.id)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should redirect to the commit page' do
|
|
|
|
# Reverting a commit that has been already reverted.
|
|
|
|
post(:revert,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
target_branch: 'master',
|
|
|
|
id: commit.id)
|
|
|
|
|
|
|
|
expect(response).to redirect_to namespace_project_commit_path(project.namespace, project, commit.id)
|
|
|
|
expect(flash[:alert]).to match('Sorry, we cannot revert this commit automatically.')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-04-18 03:39:07 -04:00
|
|
|
|
|
|
|
describe '#cherry_pick' do
|
|
|
|
context 'when target branch is not provided' do
|
|
|
|
it 'should render the 404 page' do
|
|
|
|
post(:cherry_pick,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
id: master_pickable_commit.id)
|
|
|
|
|
|
|
|
expect(response).not_to be_success
|
|
|
|
expect(response.status).to eq(404)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the cherry-pick was successful' do
|
|
|
|
it 'should redirect to the commits page' do
|
|
|
|
post(:cherry_pick,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
target_branch: 'master',
|
|
|
|
id: master_pickable_commit.id)
|
|
|
|
|
|
|
|
expect(response).to redirect_to namespace_project_commits_path(project.namespace, project, 'master')
|
|
|
|
expect(flash[:notice]).to eq('The commit has been successfully cherry-picked.')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when the cherry_pick failed' do
|
|
|
|
before do
|
|
|
|
post(:cherry_pick,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
target_branch: 'master',
|
|
|
|
id: master_pickable_commit.id)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should redirect to the commit page' do
|
|
|
|
# Cherry-picking a commit that has been already cherry-picked.
|
|
|
|
post(:cherry_pick,
|
|
|
|
namespace_id: project.namespace.to_param,
|
|
|
|
project_id: project.to_param,
|
|
|
|
target_branch: 'master',
|
|
|
|
id: master_pickable_commit.id)
|
|
|
|
|
|
|
|
expect(response).to redirect_to namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
|
|
|
|
expect(flash[:alert]).to match('Sorry, we cannot cherry-pick this commit automatically.')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2012-11-24 18:05:11 -05:00
|
|
|
end
|