145 lines
3.5 KiB
Ruby
145 lines
3.5 KiB
Ruby
require "spec_helper"
|
|
|
|
describe Files::MultiService do
|
|
subject { described_class.new(project, user, commit_params) }
|
|
|
|
let(:project) { create(:project, :repository) }
|
|
let(:user) { create(:user) }
|
|
let(:branch_name) { project.default_branch }
|
|
let(:original_file_path) { 'files/ruby/popen.rb' }
|
|
let(:new_file_path) { 'files/ruby/popen.rb' }
|
|
let(:action) { 'update' }
|
|
|
|
let!(:original_commit_id) do
|
|
Gitlab::Git::Commit.last_for_path(project.repository, branch_name, original_file_path).sha
|
|
end
|
|
|
|
let(:actions) do
|
|
[
|
|
{
|
|
action: action,
|
|
file_path: new_file_path,
|
|
previous_path: original_file_path,
|
|
content: 'New content',
|
|
last_commit_id: original_commit_id
|
|
}
|
|
]
|
|
end
|
|
|
|
let(:commit_params) do
|
|
{
|
|
commit_message: "Update File",
|
|
branch_name: branch_name,
|
|
start_branch: branch_name,
|
|
actions: actions
|
|
}
|
|
end
|
|
|
|
before do
|
|
project.add_master(user)
|
|
end
|
|
|
|
describe '#execute' do
|
|
context 'with a valid action' do
|
|
it 'returns a hash with the :success status' do
|
|
results = subject.execute
|
|
|
|
expect(results[:status]).to eq(:success)
|
|
end
|
|
end
|
|
|
|
context 'with an invalid action' do
|
|
let(:action) { 'rename' }
|
|
|
|
it 'returns a hash with the :error status' do
|
|
results = subject.execute
|
|
|
|
expect(results[:status]).to eq(:error)
|
|
expect(results[:message]).to match(/Unknown action/)
|
|
end
|
|
end
|
|
|
|
describe 'Updating files' do
|
|
context 'when the file has been previously updated' do
|
|
before do
|
|
update_file(original_file_path)
|
|
end
|
|
|
|
it 'rejects the commit' do
|
|
results = subject.execute
|
|
|
|
expect(results[:status]).to eq(:error)
|
|
expect(results[:message]).to match(new_file_path)
|
|
end
|
|
end
|
|
|
|
context 'when the file have not been modified' do
|
|
it 'accepts the commit' do
|
|
results = subject.execute
|
|
|
|
expect(results[:status]).to eq(:success)
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when moving a file' do
|
|
let(:action) { 'move' }
|
|
let(:new_file_path) { 'files/ruby/new_popen.rb' }
|
|
|
|
context 'when original file has been updated' do
|
|
before do
|
|
update_file(original_file_path)
|
|
end
|
|
|
|
it 'rejects the commit' do
|
|
results = subject.execute
|
|
|
|
expect(results[:status]).to eq(:error)
|
|
expect(results[:message]).to match(original_file_path)
|
|
end
|
|
end
|
|
|
|
context 'when original file have not been updated' do
|
|
it 'moves the file' do
|
|
results = subject.execute
|
|
blob = project.repository.blob_at_branch(branch_name, new_file_path)
|
|
|
|
expect(results[:status]).to eq(:success)
|
|
expect(blob).to be_present
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'when file status validation is skipped' do
|
|
let(:action) { 'create' }
|
|
let(:new_file_path) { 'files/ruby/new_file.rb' }
|
|
|
|
it 'does not check the last commit' do
|
|
expect(Gitlab::Git::Commit).not_to receive(:last_for_path)
|
|
|
|
subject.execute
|
|
end
|
|
|
|
it 'creates the file' do
|
|
subject.execute
|
|
|
|
blob = project.repository.blob_at_branch(branch_name, new_file_path)
|
|
|
|
expect(blob).to be_present
|
|
end
|
|
end
|
|
end
|
|
|
|
def update_file(path)
|
|
params = {
|
|
file_path: path,
|
|
start_branch: branch_name,
|
|
branch_name: branch_name,
|
|
commit_message: 'Update file',
|
|
file_content: 'New content'
|
|
}
|
|
|
|
Files::UpdateService.new(project, user, params).execute
|
|
end
|
|
end
|