2016-06-24 17:20:53 -04:00
|
|
|
require 'rails_helper'
|
|
|
|
|
|
|
|
describe Projects::BlobController do
|
2017-09-29 04:04:50 -04:00
|
|
|
include ProjectForksHelper
|
|
|
|
|
2017-01-25 16:44:33 -05:00
|
|
|
let(:project) { create(:project, :public, :repository) }
|
2016-06-24 17:20:53 -04:00
|
|
|
|
2017-04-25 08:28:55 -04:00
|
|
|
describe "GET show" do
|
|
|
|
render_views
|
|
|
|
|
|
|
|
context 'with file path' do
|
|
|
|
before do
|
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
|
|
|
id: id)
|
|
|
|
end
|
|
|
|
|
|
|
|
context "valid branch, valid file" do
|
|
|
|
let(:id) { 'master/README.md' }
|
|
|
|
it { is_expected.to respond_with(:success) }
|
|
|
|
end
|
|
|
|
|
|
|
|
context "valid branch, invalid file" do
|
|
|
|
let(:id) { 'master/invalid-path.rb' }
|
|
|
|
it { is_expected.to respond_with(:not_found) }
|
|
|
|
end
|
|
|
|
|
|
|
|
context "invalid branch, valid file" do
|
|
|
|
let(:id) { 'invalid-branch/README.md' }
|
|
|
|
it { is_expected.to respond_with(:not_found) }
|
|
|
|
end
|
|
|
|
|
|
|
|
context "binary file" do
|
|
|
|
let(:id) { 'binary-encoding/encoding/binary-1.bin' }
|
|
|
|
it { is_expected.to respond_with(:success) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-06-15 14:10:49 -04:00
|
|
|
context 'with file path and JSON format' do
|
|
|
|
context "valid branch, valid file" do
|
|
|
|
let(:id) { 'master/README.md' }
|
|
|
|
|
|
|
|
before do
|
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
|
|
|
id: id,
|
|
|
|
format: :json)
|
|
|
|
end
|
|
|
|
|
|
|
|
it do
|
|
|
|
expect(response).to be_ok
|
|
|
|
expect(json_response).to have_key 'html'
|
2017-08-04 08:45:44 -04:00
|
|
|
expect(json_response).to have_key 'raw_path'
|
2017-06-15 14:10:49 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-04-25 08:28:55 -04:00
|
|
|
context 'with tree path' do
|
|
|
|
before do
|
|
|
|
get(:show,
|
|
|
|
namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
|
|
|
id: id)
|
|
|
|
controller.instance_variable_set(:@blob, nil)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'redirect to tree' do
|
|
|
|
let(:id) { 'markdown/doc' }
|
|
|
|
it 'redirects' do
|
2017-06-21 09:48:12 -04:00
|
|
|
expect(subject)
|
2017-07-20 05:34:09 -04:00
|
|
|
.to redirect_to("/#{project.full_path}/tree/markdown/doc")
|
2017-04-25 08:28:55 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-24 17:20:53 -04:00
|
|
|
describe 'GET diff' do
|
2017-04-06 12:36:38 -04:00
|
|
|
let(:user) { create(:user) }
|
|
|
|
|
2016-06-24 17:20:53 -04:00
|
|
|
render_views
|
|
|
|
|
|
|
|
def do_get(opts = {})
|
2017-02-23 18:55:01 -05:00
|
|
|
params = { namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
2016-06-24 17:20:53 -04:00
|
|
|
id: 'master/CHANGELOG' }
|
|
|
|
get :diff, params.merge(opts)
|
|
|
|
end
|
|
|
|
|
2017-04-06 12:36:38 -04:00
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_master(user)
|
2017-04-06 12:36:38 -04:00
|
|
|
|
|
|
|
sign_in(user)
|
|
|
|
end
|
|
|
|
|
2016-06-24 17:20:53 -04:00
|
|
|
context 'when essential params are missing' do
|
|
|
|
it 'renders nothing' do
|
|
|
|
do_get
|
|
|
|
|
|
|
|
expect(response.body).to be_blank
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when essential params are present' do
|
|
|
|
it 'renders the diff content' do
|
|
|
|
do_get(since: 1, to: 5, offset: 10)
|
|
|
|
|
|
|
|
expect(response.body).to be_present
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-11-07 12:09:22 -05:00
|
|
|
|
2017-04-06 12:36:38 -04:00
|
|
|
describe 'GET edit' do
|
|
|
|
let(:default_params) do
|
|
|
|
{
|
|
|
|
namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
|
|
|
id: 'master/CHANGELOG'
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'anonymous' do
|
|
|
|
before do
|
|
|
|
get :edit, default_params
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'redirects to sign in and returns' do
|
|
|
|
expect(response).to redirect_to(new_user_session_path)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as guest' do
|
|
|
|
let(:guest) { create(:user) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
sign_in(guest)
|
|
|
|
get :edit, default_params
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'redirects to blob show' do
|
2017-06-29 13:06:35 -04:00
|
|
|
expect(response).to redirect_to(project_blob_path(project, 'master/CHANGELOG'))
|
2017-04-06 12:36:38 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as developer' do
|
|
|
|
let(:developer) { create(:user) }
|
|
|
|
|
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_developer(developer)
|
2017-04-06 12:36:38 -04:00
|
|
|
sign_in(developer)
|
|
|
|
get :edit, default_params
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'redirects to blob show' do
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(200)
|
2017-04-06 12:36:38 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'as master' do
|
|
|
|
let(:master) { create(:user) }
|
|
|
|
|
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_master(master)
|
2017-04-06 12:36:38 -04:00
|
|
|
sign_in(master)
|
|
|
|
get :edit, default_params
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'redirects to blob show' do
|
2017-10-19 14:28:19 -04:00
|
|
|
expect(response).to have_gitlab_http_status(200)
|
2017-04-06 12:36:38 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-07 12:09:22 -05:00
|
|
|
describe 'PUT update' do
|
2017-04-06 12:36:38 -04:00
|
|
|
let(:user) { create(:user) }
|
2016-11-07 12:09:22 -05:00
|
|
|
let(:default_params) do
|
|
|
|
{
|
2017-02-23 18:55:01 -05:00
|
|
|
namespace_id: project.namespace,
|
|
|
|
project_id: project,
|
2016-11-07 12:09:22 -05:00
|
|
|
id: 'master/CHANGELOG',
|
2017-04-19 20:37:44 -04:00
|
|
|
branch_name: 'master',
|
2016-11-07 12:09:22 -05:00
|
|
|
content: 'Added changes',
|
|
|
|
commit_message: 'Update CHANGELOG'
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
def blob_after_edit_path
|
2017-06-29 13:06:35 -04:00
|
|
|
project_blob_path(project, 'master/CHANGELOG')
|
2016-11-07 12:09:22 -05:00
|
|
|
end
|
|
|
|
|
2017-04-06 12:36:38 -04:00
|
|
|
before do
|
2017-12-22 03:18:28 -05:00
|
|
|
project.add_master(user)
|
2017-04-06 12:36:38 -04:00
|
|
|
|
|
|
|
sign_in(user)
|
|
|
|
end
|
|
|
|
|
2016-11-07 12:09:22 -05:00
|
|
|
it 'redirects to blob' do
|
|
|
|
put :update, default_params
|
|
|
|
|
|
|
|
expect(response).to redirect_to(blob_after_edit_path)
|
|
|
|
end
|
|
|
|
|
|
|
|
context '?from_merge_request_iid' do
|
|
|
|
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
|
|
|
|
let(:mr_params) { default_params.merge(from_merge_request_iid: merge_request.iid) }
|
|
|
|
|
|
|
|
it 'redirects to MR diff' do
|
|
|
|
put :update, mr_params
|
|
|
|
|
2017-06-29 13:06:35 -04:00
|
|
|
after_edit_path = diffs_project_merge_request_path(project, merge_request)
|
2016-11-29 04:40:56 -05:00
|
|
|
file_anchor = "##{Digest::SHA1.hexdigest('CHANGELOG')}"
|
2016-11-07 12:09:22 -05:00
|
|
|
expect(response).to redirect_to(after_edit_path + file_anchor)
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when user doesn't have access" do
|
|
|
|
before do
|
2017-08-02 15:55:11 -04:00
|
|
|
other_project = create(:project, :repository)
|
2016-11-07 12:09:22 -05:00
|
|
|
merge_request.update!(source_project: other_project, target_project: other_project)
|
|
|
|
end
|
|
|
|
|
|
|
|
it "it redirect to blob" do
|
|
|
|
put :update, mr_params
|
|
|
|
|
|
|
|
expect(response).to redirect_to(blob_after_edit_path)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-12-29 18:09:13 -05:00
|
|
|
|
|
|
|
context 'when user has forked project' do
|
2017-09-29 04:04:50 -04:00
|
|
|
let!(:forked_project) { fork_project(project, guest, namespace: guest.namespace, repository: true) }
|
|
|
|
let(:guest) { create(:user) }
|
2016-12-29 18:09:13 -05:00
|
|
|
|
2017-02-20 12:16:08 -05:00
|
|
|
before do
|
|
|
|
sign_in(guest)
|
|
|
|
end
|
2016-12-29 18:09:13 -05:00
|
|
|
|
2017-02-17 13:46:21 -05:00
|
|
|
context 'when editing on the fork' do
|
|
|
|
before do
|
2017-02-23 18:55:01 -05:00
|
|
|
default_params[:namespace_id] = forked_project.namespace
|
|
|
|
default_params[:project_id] = forked_project
|
2017-02-17 13:46:21 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'redirects to blob' do
|
|
|
|
put :update, default_params
|
|
|
|
|
2017-06-29 13:06:35 -04:00
|
|
|
expect(response).to redirect_to(project_blob_path(forked_project, 'master/CHANGELOG'))
|
2017-02-17 13:46:21 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when editing on the original repository' do
|
|
|
|
it "redirects to forked project new merge request" do
|
2017-04-19 20:37:44 -04:00
|
|
|
default_params[:branch_name] = "fork-test-1"
|
2017-02-17 13:46:21 -05:00
|
|
|
default_params[:create_merge_request] = 1
|
|
|
|
|
|
|
|
put :update, default_params
|
|
|
|
|
|
|
|
expect(response).to redirect_to(
|
2017-06-29 13:06:35 -04:00
|
|
|
project_new_merge_request_path(
|
2017-02-17 13:46:21 -05:00
|
|
|
forked_project,
|
|
|
|
merge_request: {
|
|
|
|
source_project_id: forked_project.id,
|
|
|
|
target_project_id: project.id,
|
|
|
|
source_branch: "fork-test-1",
|
|
|
|
target_branch: "master"
|
|
|
|
}
|
|
|
|
)
|
2016-12-29 18:09:13 -05:00
|
|
|
)
|
2017-02-17 13:46:21 -05:00
|
|
|
end
|
2016-12-29 18:09:13 -05:00
|
|
|
end
|
|
|
|
end
|
2016-11-07 12:09:22 -05:00
|
|
|
end
|
2016-06-24 17:20:53 -04:00
|
|
|
end
|