2014-09-29 09:40:13 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2015-12-09 04:50:51 -05:00
|
|
|
describe Repository, models: true do
|
2014-09-29 09:40:13 -04:00
|
|
|
include RepoHelpers
|
|
|
|
|
|
|
|
let(:repository) { create(:project).repository }
|
2015-11-25 19:20:40 -05:00
|
|
|
let(:user) { create(:user) }
|
2016-02-01 20:24:52 -05:00
|
|
|
let(:commit_options) do
|
|
|
|
author = repository.user_to_committer(user)
|
|
|
|
{ message: 'Test message', committer: author, author: author }
|
|
|
|
end
|
2016-02-10 18:02:46 -05:00
|
|
|
let(:merge_commit) do
|
2016-02-01 20:24:52 -05:00
|
|
|
source_sha = repository.find_branch('feature').target
|
2016-02-10 18:02:46 -05:00
|
|
|
merge_commit_id = repository.merge(user, source_sha, 'master', commit_options)
|
|
|
|
repository.commit(merge_commit_id)
|
2016-02-01 20:24:52 -05:00
|
|
|
end
|
2014-09-29 09:40:13 -04:00
|
|
|
|
|
|
|
describe :branch_names_contains do
|
|
|
|
subject { repository.branch_names_contains(sample_commit.id) }
|
|
|
|
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to include('master') }
|
|
|
|
it { is_expected.not_to include('feature') }
|
|
|
|
it { is_expected.not_to include('fix') }
|
2014-09-29 09:40:13 -04:00
|
|
|
end
|
2014-09-29 09:45:16 -04:00
|
|
|
|
2015-03-22 14:01:45 -04:00
|
|
|
describe :tag_names_contains do
|
|
|
|
subject { repository.tag_names_contains(sample_commit.id) }
|
2015-03-09 18:10:59 -04:00
|
|
|
|
2015-03-22 14:01:45 -04:00
|
|
|
it { is_expected.to include('v1.1.0') }
|
|
|
|
it { is_expected.not_to include('v1.0.0') }
|
2015-03-13 06:39:26 -04:00
|
|
|
end
|
|
|
|
|
2015-03-22 14:01:45 -04:00
|
|
|
describe :last_commit_for_path do
|
|
|
|
subject { repository.last_commit_for_path(sample_commit.id, '.gitignore').id }
|
2015-03-13 06:39:26 -04:00
|
|
|
|
2015-03-22 14:01:45 -04:00
|
|
|
it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
|
2015-03-09 18:10:59 -04:00
|
|
|
end
|
2015-07-01 05:02:37 -04:00
|
|
|
|
2015-11-02 10:39:24 -05:00
|
|
|
describe :find_commits_by_message do
|
|
|
|
subject { repository.find_commits_by_message('submodule').map{ |k| k.id } }
|
2015-06-14 18:04:20 -04:00
|
|
|
|
|
|
|
it { is_expected.to include('5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
|
|
|
|
it { is_expected.to include('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
|
|
|
|
it { is_expected.to include('cfe32cf61b73a0d5e9f13e774abde7ff789b1660') }
|
|
|
|
it { is_expected.not_to include('913c66a37b4a45b9769037c55c2d238bd0942d2e') }
|
|
|
|
end
|
|
|
|
|
2015-07-01 05:02:37 -04:00
|
|
|
describe :blob_at do
|
|
|
|
context 'blank sha' do
|
|
|
|
subject { repository.blob_at(Gitlab::Git::BLANK_SHA, '.gitignore') }
|
|
|
|
|
|
|
|
it { is_expected.to be_nil }
|
|
|
|
end
|
|
|
|
end
|
2015-07-01 11:24:03 -04:00
|
|
|
|
2015-08-09 14:31:50 -04:00
|
|
|
describe :merged_to_root_ref? do
|
|
|
|
context 'merged branch' do
|
|
|
|
subject { repository.merged_to_root_ref?('improve/awesome') }
|
|
|
|
|
|
|
|
it { is_expected.to be_truthy }
|
|
|
|
end
|
2015-08-17 05:41:53 -04:00
|
|
|
end
|
|
|
|
|
2015-08-11 08:33:31 -04:00
|
|
|
describe :can_be_merged? do
|
|
|
|
context 'mergeable branches' do
|
|
|
|
subject { repository.can_be_merged?('0b4bc9a49b562e85de7cc9e834518ea6828729b9', 'master') }
|
|
|
|
|
|
|
|
it { is_expected.to be_truthy }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'non-mergeable branches' do
|
|
|
|
subject { repository.can_be_merged?('bb5206fee213d983da88c47f9cf4cc6caf9c66dc', 'feature') }
|
|
|
|
|
|
|
|
it { is_expected.to be_falsey }
|
|
|
|
end
|
2015-08-09 14:31:50 -04:00
|
|
|
|
|
|
|
context 'non merged branch' do
|
|
|
|
subject { repository.merged_to_root_ref?('fix') }
|
|
|
|
|
|
|
|
it { is_expected.to be_falsey }
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'non existent branch' do
|
|
|
|
subject { repository.merged_to_root_ref?('non_existent_branch') }
|
|
|
|
|
|
|
|
it { is_expected.to be_nil }
|
|
|
|
end
|
2015-08-11 08:33:31 -04:00
|
|
|
end
|
|
|
|
|
2015-07-12 08:32:25 -04:00
|
|
|
describe "search_files" do
|
|
|
|
let(:results) { repository.search_files('feature', 'master') }
|
|
|
|
subject { results }
|
|
|
|
|
|
|
|
it { is_expected.to be_an Array }
|
|
|
|
|
|
|
|
describe 'result' do
|
|
|
|
subject { results.first }
|
|
|
|
|
|
|
|
it { is_expected.to be_an String }
|
|
|
|
it { expect(subject.lines[2]).to eq("master:CHANGELOG:188: - Feature: Replace teams with group membership\n") }
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'parsing result' do
|
2016-03-08 23:50:34 -05:00
|
|
|
subject { repository.parse_search_result(search_result) }
|
|
|
|
let(:search_result) { results.first }
|
2015-07-12 08:32:25 -04:00
|
|
|
|
|
|
|
it { is_expected.to be_an OpenStruct }
|
|
|
|
it { expect(subject.filename).to eq('CHANGELOG') }
|
2016-03-08 23:50:34 -05:00
|
|
|
it { expect(subject.basename).to eq('CHANGELOG') }
|
2015-07-12 08:32:25 -04:00
|
|
|
it { expect(subject.ref).to eq('master') }
|
|
|
|
it { expect(subject.startline).to eq(186) }
|
|
|
|
it { expect(subject.data.lines[2]).to eq(" - Feature: Replace teams with group membership\n") }
|
2016-03-08 23:50:34 -05:00
|
|
|
|
|
|
|
context "when filename has extension" do
|
|
|
|
let(:search_result) { "master:CONTRIBUTE.md:5:- [Contribute to GitLab](#contribute-to-gitlab)\n" }
|
|
|
|
|
|
|
|
it { expect(subject.filename).to eq('CONTRIBUTE.md') }
|
|
|
|
it { expect(subject.basename).to eq('CONTRIBUTE') }
|
|
|
|
end
|
|
|
|
|
|
|
|
context "when file under directory" do
|
|
|
|
let(:search_result) { "master:a/b/c.md:5:a b c\n" }
|
|
|
|
|
|
|
|
it { expect(subject.filename).to eq('a/b/c.md') }
|
|
|
|
it { expect(subject.basename).to eq('a/b/c') }
|
|
|
|
end
|
2015-07-12 08:32:25 -04:00
|
|
|
end
|
2015-11-25 19:20:40 -05:00
|
|
|
|
2015-07-12 08:32:25 -04:00
|
|
|
end
|
2015-10-01 14:34:23 -04:00
|
|
|
|
|
|
|
describe "#license" do
|
2015-11-12 11:00:39 -05:00
|
|
|
before do
|
2015-10-01 14:34:23 -04:00
|
|
|
repository.send(:cache).expire(:license)
|
|
|
|
TestBlob = Struct.new(:name)
|
2015-11-12 11:00:39 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'test selection preference' do
|
2015-10-01 14:34:23 -04:00
|
|
|
files = [TestBlob.new('file'), TestBlob.new('license'), TestBlob.new('copying')]
|
|
|
|
expect(repository.tree).to receive(:blobs).and_return(files)
|
|
|
|
|
|
|
|
expect(repository.license.name).to eq('license')
|
|
|
|
end
|
2015-11-12 11:00:39 -05:00
|
|
|
|
|
|
|
it 'also accepts licence instead of license' do
|
|
|
|
expect(repository.tree).to receive(:blobs).and_return([TestBlob.new('licence')])
|
|
|
|
|
|
|
|
expect(repository.license.name).to eq('licence')
|
|
|
|
end
|
2015-10-01 14:34:23 -04:00
|
|
|
end
|
2015-12-10 10:27:26 -05:00
|
|
|
|
2015-11-25 19:20:40 -05:00
|
|
|
describe :add_branch do
|
|
|
|
context 'when pre hooks were successful' do
|
|
|
|
it 'should run without errors' do
|
|
|
|
hook = double(trigger: true)
|
2015-12-01 00:22:45 -05:00
|
|
|
expect(Gitlab::Git::Hook).to receive(:new).exactly(3).times.and_return(hook)
|
2015-11-25 19:20:40 -05:00
|
|
|
|
|
|
|
expect { repository.add_branch(user, 'new_feature', 'master') }.not_to raise_error
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should create the branch' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(true)
|
|
|
|
|
|
|
|
branch = repository.add_branch(user, 'new_feature', 'master')
|
|
|
|
|
|
|
|
expect(branch.name).to eq('new_feature')
|
|
|
|
end
|
2016-03-08 12:04:00 -05:00
|
|
|
|
|
|
|
it 'calls the after_create_branch hook' do
|
|
|
|
expect(repository).to receive(:after_create_branch)
|
|
|
|
|
|
|
|
repository.add_branch(user, 'new_feature', 'master')
|
|
|
|
end
|
2015-11-25 19:20:40 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when pre hooks failed' do
|
|
|
|
it 'should get an error' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(false)
|
|
|
|
|
|
|
|
expect do
|
|
|
|
repository.add_branch(user, 'new_feature', 'master')
|
|
|
|
end.to raise_error(GitHooksService::PreReceiveError)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not create the branch' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(false)
|
|
|
|
|
|
|
|
expect do
|
|
|
|
repository.add_branch(user, 'new_feature', 'master')
|
|
|
|
end.to raise_error(GitHooksService::PreReceiveError)
|
|
|
|
expect(repository.find_branch('new_feature')).to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe :rm_branch do
|
|
|
|
context 'when pre hooks were successful' do
|
|
|
|
it 'should run without errors' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(true)
|
|
|
|
|
|
|
|
expect { repository.rm_branch(user, 'feature') }.not_to raise_error
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should delete the branch' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(true)
|
|
|
|
|
|
|
|
expect { repository.rm_branch(user, 'feature') }.not_to raise_error
|
|
|
|
|
|
|
|
expect(repository.find_branch('feature')).to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when pre hooks failed' do
|
|
|
|
it 'should get an error' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(false)
|
|
|
|
|
|
|
|
expect do
|
|
|
|
repository.rm_branch(user, 'new_feature')
|
|
|
|
end.to raise_error(GitHooksService::PreReceiveError)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'should not delete the branch' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(false)
|
|
|
|
|
|
|
|
expect do
|
|
|
|
repository.rm_branch(user, 'feature')
|
|
|
|
end.to raise_error(GitHooksService::PreReceiveError)
|
|
|
|
expect(repository.find_branch('feature')).not_to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe :commit_with_hooks do
|
|
|
|
context 'when pre hooks were successful' do
|
2016-02-17 10:49:16 -05:00
|
|
|
before do
|
|
|
|
expect_any_instance_of(GitHooksService).to receive(:execute).
|
|
|
|
and_return(true)
|
|
|
|
end
|
2015-11-25 19:20:40 -05:00
|
|
|
|
2016-02-17 10:49:16 -05:00
|
|
|
it 'should run without errors' do
|
2015-11-25 19:20:40 -05:00
|
|
|
expect do
|
|
|
|
repository.commit_with_hooks(user, 'feature') { sample_commit.id }
|
|
|
|
end.not_to raise_error
|
|
|
|
end
|
2016-02-17 10:49:16 -05:00
|
|
|
|
|
|
|
it 'should ensure the autocrlf Git option is set to :input' do
|
|
|
|
expect(repository).to receive(:update_autocrlf_option)
|
|
|
|
|
|
|
|
repository.commit_with_hooks(user, 'feature') { sample_commit.id }
|
|
|
|
end
|
2015-11-25 19:20:40 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when pre hooks failed' do
|
|
|
|
it 'should get an error' do
|
|
|
|
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(false)
|
|
|
|
|
|
|
|
expect do
|
|
|
|
repository.commit_with_hooks(user, 'feature') { sample_commit.id }
|
|
|
|
end.to raise_error(GitHooksService::PreReceiveError)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-01-21 12:19:18 -05:00
|
|
|
|
2016-02-18 06:28:47 -05:00
|
|
|
describe '#exists?' do
|
|
|
|
it 'returns true when a repository exists' do
|
|
|
|
expect(repository.exists?).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false when a repository does not exist' do
|
|
|
|
expect(repository.raw_repository).to receive(:rugged).
|
|
|
|
and_raise(Gitlab::Git::Repository::NoRepository)
|
|
|
|
|
|
|
|
expect(repository.exists?).to eq(false)
|
|
|
|
end
|
2016-02-18 08:19:35 -05:00
|
|
|
|
|
|
|
it 'returns false when there is no namespace' do
|
|
|
|
allow(repository).to receive(:path_with_namespace).and_return(nil)
|
|
|
|
|
|
|
|
expect(repository.exists?).to eq(false)
|
|
|
|
end
|
2016-02-18 06:28:47 -05:00
|
|
|
end
|
|
|
|
|
2016-01-21 12:19:18 -05:00
|
|
|
describe '#has_visible_content?' do
|
|
|
|
subject { repository.has_visible_content? }
|
|
|
|
|
|
|
|
describe 'when there are no branches' do
|
|
|
|
before do
|
|
|
|
allow(repository.raw_repository).to receive(:branch_count).and_return(0)
|
|
|
|
end
|
|
|
|
|
|
|
|
it { is_expected.to eq(false) }
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when there are branches' do
|
2016-02-08 06:50:55 -05:00
|
|
|
it 'returns true' do
|
|
|
|
expect(repository.raw_repository).to receive(:branch_count).and_return(3)
|
|
|
|
|
|
|
|
expect(subject).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'caches the output' do
|
|
|
|
expect(repository.raw_repository).to receive(:branch_count).
|
|
|
|
once.
|
|
|
|
and_return(3)
|
|
|
|
|
|
|
|
repository.has_visible_content?
|
|
|
|
repository.has_visible_content?
|
2016-01-21 12:19:18 -05:00
|
|
|
end
|
2016-02-08 06:50:55 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-17 10:49:16 -05:00
|
|
|
describe '#update_autocrlf_option' do
|
|
|
|
describe 'when autocrlf is not already set to :input' do
|
|
|
|
before do
|
|
|
|
repository.raw_repository.autocrlf = true
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'sets autocrlf to :input' do
|
|
|
|
repository.update_autocrlf_option
|
|
|
|
|
|
|
|
expect(repository.raw_repository.autocrlf).to eq(:input)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when autocrlf is already set to :input' do
|
|
|
|
before do
|
|
|
|
repository.raw_repository.autocrlf = :input
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does nothing' do
|
|
|
|
expect(repository.raw_repository).to_not receive(:autocrlf=).
|
|
|
|
with(:input)
|
|
|
|
|
|
|
|
repository.update_autocrlf_option
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-02-08 06:50:55 -05:00
|
|
|
describe '#empty?' do
|
|
|
|
let(:empty_repository) { create(:project_empty_repo).repository }
|
|
|
|
|
|
|
|
it 'returns true for an empty repository' do
|
|
|
|
expect(empty_repository.empty?).to eq(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false for a non-empty repository' do
|
|
|
|
expect(repository.empty?).to eq(false)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'caches the output' do
|
|
|
|
expect(repository.raw_repository).to receive(:empty?).
|
|
|
|
once.
|
|
|
|
and_return(false)
|
|
|
|
|
|
|
|
repository.empty?
|
|
|
|
repository.empty?
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#root_ref' do
|
|
|
|
it 'returns a branch name' do
|
|
|
|
expect(repository.root_ref).to be_an_instance_of(String)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'caches the output' do
|
|
|
|
expect(repository.raw_repository).to receive(:root_ref).
|
|
|
|
once.
|
|
|
|
and_return('master')
|
|
|
|
|
|
|
|
repository.root_ref
|
|
|
|
repository.root_ref
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expire_cache' do
|
|
|
|
it 'expires all caches' do
|
|
|
|
expect(repository).to receive(:expire_branch_cache)
|
|
|
|
|
|
|
|
repository.expire_cache
|
|
|
|
end
|
2016-02-09 08:59:11 -05:00
|
|
|
|
|
|
|
it 'expires the caches for a specific branch' do
|
|
|
|
expect(repository).to receive(:expire_branch_cache).with('master')
|
|
|
|
|
|
|
|
repository.expire_cache('master')
|
|
|
|
end
|
2016-02-20 10:23:54 -05:00
|
|
|
|
2016-02-25 06:56:04 -05:00
|
|
|
it 'expires the emptiness caches for an empty repository' do
|
2016-02-20 10:23:54 -05:00
|
|
|
expect(repository).to receive(:empty?).and_return(true)
|
|
|
|
expect(repository).to receive(:expire_emptiness_caches)
|
|
|
|
|
|
|
|
repository.expire_cache
|
|
|
|
end
|
|
|
|
|
2016-02-25 06:56:04 -05:00
|
|
|
it 'does not expire the emptiness caches for a non-empty repository' do
|
2016-02-20 10:23:54 -05:00
|
|
|
expect(repository).to receive(:empty?).and_return(false)
|
|
|
|
expect(repository).to_not receive(:expire_emptiness_caches)
|
|
|
|
|
|
|
|
repository.expire_cache
|
|
|
|
end
|
2016-02-08 06:50:55 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expire_root_ref_cache' do
|
|
|
|
it 'expires the root reference cache' do
|
|
|
|
repository.root_ref
|
|
|
|
|
|
|
|
expect(repository.raw_repository).to receive(:root_ref).
|
|
|
|
once.
|
|
|
|
and_return('foo')
|
|
|
|
|
|
|
|
repository.expire_root_ref_cache
|
|
|
|
|
|
|
|
expect(repository.root_ref).to eq('foo')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expire_has_visible_content_cache' do
|
|
|
|
it 'expires the visible content cache' do
|
|
|
|
repository.has_visible_content?
|
|
|
|
|
|
|
|
expect(repository.raw_repository).to receive(:branch_count).
|
|
|
|
once.
|
|
|
|
and_return(0)
|
|
|
|
|
|
|
|
repository.expire_has_visible_content_cache
|
2016-01-21 12:19:18 -05:00
|
|
|
|
2016-02-08 06:50:55 -05:00
|
|
|
expect(repository.has_visible_content?).to eq(false)
|
2016-01-21 12:19:18 -05:00
|
|
|
end
|
|
|
|
end
|
2016-02-09 08:59:11 -05:00
|
|
|
|
2016-03-08 11:38:23 -05:00
|
|
|
describe '#expire_branch_cache' do
|
2016-02-09 08:59:11 -05:00
|
|
|
# This method is private but we need it for testing purposes. Sadly there's
|
|
|
|
# no other proper way of testing caching operations.
|
|
|
|
let(:cache) { repository.send(:cache) }
|
|
|
|
|
|
|
|
it 'expires the cache for all branches' do
|
|
|
|
expect(cache).to receive(:expire).
|
|
|
|
at_least(repository.branches.length).
|
|
|
|
times
|
|
|
|
|
|
|
|
repository.expire_branch_cache
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'expires the cache for all branches when the root branch is given' do
|
|
|
|
expect(cache).to receive(:expire).
|
|
|
|
at_least(repository.branches.length).
|
|
|
|
times
|
|
|
|
|
|
|
|
repository.expire_branch_cache(repository.root_ref)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'expires the cache for a specific branch' do
|
|
|
|
expect(cache).to receive(:expire).once
|
|
|
|
|
|
|
|
repository.expire_branch_cache('foo')
|
|
|
|
end
|
|
|
|
end
|
2015-12-11 08:47:57 -05:00
|
|
|
|
2016-02-16 11:31:37 -05:00
|
|
|
describe '#expire_emptiness_caches' do
|
|
|
|
let(:cache) { repository.send(:cache) }
|
|
|
|
|
|
|
|
it 'expires the caches' do
|
|
|
|
expect(cache).to receive(:expire).with(:empty?)
|
|
|
|
expect(repository).to receive(:expire_has_visible_content_cache)
|
|
|
|
|
|
|
|
repository.expire_emptiness_caches
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2015-12-11 08:47:57 -05:00
|
|
|
describe :skip_merged_commit do
|
|
|
|
subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", nil, 100, 0, true).map{ |k| k.id } }
|
|
|
|
|
|
|
|
it { is_expected.not_to include('e56497bb5f03a90a51293fc6d516788730953899') }
|
|
|
|
end
|
2016-02-01 20:24:52 -05:00
|
|
|
|
|
|
|
describe '#merge' do
|
|
|
|
it 'should merge the code and return the commit id' do
|
2016-02-10 18:02:46 -05:00
|
|
|
expect(merge_commit).to be_present
|
|
|
|
expect(repository.blob_at(merge_commit.id, 'files/ruby/feature.rb')).to be_present
|
2016-02-01 20:24:52 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-03-01 19:14:52 -05:00
|
|
|
describe '#revert' do
|
|
|
|
let(:new_image_commit) { repository.commit('33f3729a45c02fc67d00adb1b8bca394b0e761d9') }
|
|
|
|
let(:update_image_commit) { repository.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
|
2016-02-01 20:24:52 -05:00
|
|
|
|
2016-03-01 19:14:52 -05:00
|
|
|
context 'when there is a conflict' do
|
|
|
|
it 'should abort the operation' do
|
|
|
|
expect(repository.revert(user, new_image_commit, 'master')).to eq(false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when commit was already reverted' do
|
|
|
|
it 'should abort the operation' do
|
|
|
|
repository.revert(user, update_image_commit, 'master')
|
|
|
|
|
|
|
|
expect(repository.revert(user, update_image_commit, 'master')).to eq(false)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when commit can be reverted' do
|
|
|
|
it 'should revert the changes' do
|
|
|
|
expect(repository.revert(user, update_image_commit, 'master')).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'reverting a merge commit' do
|
|
|
|
it 'should revert the changes' do
|
|
|
|
merge_commit
|
|
|
|
expect(repository.blob_at_branch('master', 'files/ruby/feature.rb')).to be_present
|
|
|
|
|
|
|
|
repository.revert(user, merge_commit, 'master')
|
|
|
|
expect(repository.blob_at_branch('master', 'files/ruby/feature.rb')).not_to be_present
|
|
|
|
end
|
2016-02-01 20:24:52 -05:00
|
|
|
end
|
|
|
|
end
|
2016-02-25 06:56:04 -05:00
|
|
|
|
|
|
|
describe '#before_delete' do
|
|
|
|
describe 'when a repository does not exist' do
|
|
|
|
before do
|
|
|
|
allow(repository).to receive(:exists?).and_return(false)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not flush caches that depend on repository data' do
|
|
|
|
expect(repository).to_not receive(:expire_cache)
|
|
|
|
|
|
|
|
repository.before_delete
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the root ref cache' do
|
|
|
|
expect(repository).to receive(:expire_root_ref_cache)
|
|
|
|
|
|
|
|
repository.before_delete
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the emptiness caches' do
|
|
|
|
expect(repository).to receive(:expire_emptiness_caches)
|
|
|
|
|
|
|
|
repository.before_delete
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe 'when a repository exists' do
|
|
|
|
before do
|
|
|
|
allow(repository).to receive(:exists?).and_return(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the caches that depend on repository data' do
|
|
|
|
expect(repository).to receive(:expire_cache)
|
|
|
|
|
|
|
|
repository.before_delete
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the root ref cache' do
|
|
|
|
expect(repository).to receive(:expire_root_ref_cache)
|
|
|
|
|
|
|
|
repository.before_delete
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the emptiness caches' do
|
|
|
|
expect(repository).to receive(:expire_emptiness_caches)
|
|
|
|
|
|
|
|
repository.before_delete
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#before_change_head' do
|
|
|
|
it 'flushes the branch cache' do
|
|
|
|
expect(repository).to receive(:expire_branch_cache)
|
|
|
|
|
|
|
|
repository.before_change_head
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the root ref cache' do
|
|
|
|
expect(repository).to receive(:expire_root_ref_cache)
|
|
|
|
|
|
|
|
repository.before_change_head
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-03-08 11:38:23 -05:00
|
|
|
describe '#before_push_tag' do
|
2016-02-25 06:56:04 -05:00
|
|
|
it 'flushes the cache' do
|
|
|
|
expect(repository).to receive(:expire_cache)
|
2016-03-08 11:38:23 -05:00
|
|
|
expect(repository).to receive(:expire_tag_count_cache)
|
2016-02-25 06:56:04 -05:00
|
|
|
|
2016-03-08 11:38:23 -05:00
|
|
|
repository.before_push_tag
|
2016-02-25 06:56:04 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#after_import' do
|
|
|
|
it 'flushes the emptiness cachess' do
|
|
|
|
expect(repository).to receive(:expire_emptiness_caches)
|
|
|
|
|
|
|
|
repository.after_import
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#after_push_commit' do
|
|
|
|
it 'flushes the cache' do
|
2016-03-17 11:53:05 -04:00
|
|
|
expect(repository).to receive(:expire_cache).with('master', '123')
|
2016-02-25 06:56:04 -05:00
|
|
|
|
2016-03-17 11:53:05 -04:00
|
|
|
repository.after_push_commit('master', '123')
|
2016-02-25 06:56:04 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#after_create_branch' do
|
|
|
|
it 'flushes the visible content cache' do
|
|
|
|
expect(repository).to receive(:expire_has_visible_content_cache)
|
|
|
|
|
|
|
|
repository.after_create_branch
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#after_remove_branch' do
|
|
|
|
it 'flushes the visible content cache' do
|
|
|
|
expect(repository).to receive(:expire_has_visible_content_cache)
|
|
|
|
|
|
|
|
repository.after_remove_branch
|
|
|
|
end
|
|
|
|
end
|
2016-03-01 14:45:55 -05:00
|
|
|
|
|
|
|
describe "#main_language" do
|
|
|
|
it 'shows the main language of the project' do
|
|
|
|
expect(repository.main_language).to eq("Ruby")
|
|
|
|
end
|
2016-03-02 07:55:01 -05:00
|
|
|
|
|
|
|
it 'returns nil when the repository is empty' do
|
|
|
|
allow(repository).to receive(:empty?).and_return(true)
|
|
|
|
|
|
|
|
expect(repository.main_language).to be_nil
|
|
|
|
end
|
2016-03-01 14:45:55 -05:00
|
|
|
end
|
2016-03-08 11:38:23 -05:00
|
|
|
|
|
|
|
describe '#before_remove_tag' do
|
|
|
|
it 'flushes the tag cache' do
|
|
|
|
expect(repository).to receive(:expire_tag_count_cache)
|
|
|
|
|
|
|
|
repository.before_remove_tag
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#branch_count' do
|
|
|
|
it 'returns the number of branches' do
|
|
|
|
expect(repository.branch_count).to be_an_instance_of(Fixnum)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#tag_count' do
|
|
|
|
it 'returns the number of tags' do
|
|
|
|
expect(repository.tag_count).to be_an_instance_of(Fixnum)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expire_branch_count_cache' do
|
|
|
|
let(:cache) { repository.send(:cache) }
|
|
|
|
|
|
|
|
it 'expires the cache' do
|
|
|
|
expect(cache).to receive(:expire).with(:branch_count)
|
|
|
|
|
|
|
|
repository.expire_branch_count_cache
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expire_tag_count_cache' do
|
|
|
|
let(:cache) { repository.send(:cache) }
|
|
|
|
|
|
|
|
it 'expires the cache' do
|
|
|
|
expect(cache).to receive(:expire).with(:tag_count)
|
|
|
|
|
|
|
|
repository.expire_tag_count_cache
|
|
|
|
end
|
|
|
|
end
|
2016-03-08 11:53:00 -05:00
|
|
|
|
2016-03-08 12:01:16 -05:00
|
|
|
describe '#add_tag' do
|
|
|
|
it 'adds a tag' do
|
|
|
|
expect(repository).to receive(:before_push_tag)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitlab::Shell).to receive(:add_tag).
|
|
|
|
with(repository.path_with_namespace, '8.5', 'master', 'foo')
|
|
|
|
|
|
|
|
repository.add_tag('8.5', 'master', 'foo')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-03-08 11:53:00 -05:00
|
|
|
describe '#rm_branch' do
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
|
|
|
|
it 'removes a branch' do
|
|
|
|
expect(repository).to receive(:before_remove_branch)
|
|
|
|
expect(repository).to receive(:after_remove_branch)
|
|
|
|
|
|
|
|
repository.rm_branch(user, 'feature')
|
|
|
|
end
|
|
|
|
end
|
2016-03-08 11:53:23 -05:00
|
|
|
|
|
|
|
describe '#rm_tag' do
|
|
|
|
it 'removes a tag' do
|
|
|
|
expect(repository).to receive(:before_remove_tag)
|
|
|
|
|
|
|
|
expect_any_instance_of(Gitlab::Shell).to receive(:rm_tag).
|
|
|
|
with(repository.path_with_namespace, '8.5')
|
|
|
|
|
|
|
|
repository.rm_tag('8.5')
|
|
|
|
end
|
|
|
|
end
|
2016-03-17 11:53:05 -04:00
|
|
|
|
|
|
|
describe '#avatar' do
|
|
|
|
it 'returns the first avatar file found in the repository' do
|
|
|
|
expect(repository).to receive(:blob_at_branch).
|
|
|
|
with('master', 'logo.png').
|
|
|
|
and_return(true)
|
|
|
|
|
|
|
|
expect(repository.avatar).to eq('logo.png')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'caches the output' do
|
|
|
|
allow(repository).to receive(:blob_at_branch).
|
|
|
|
with('master', 'logo.png').
|
|
|
|
and_return(true)
|
|
|
|
|
|
|
|
expect(repository.avatar).to eq('logo.png')
|
|
|
|
|
|
|
|
expect(repository).to_not receive(:blob_at_branch)
|
|
|
|
expect(repository.avatar).to eq('logo.png')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#expire_avatar_cache' do
|
|
|
|
let(:cache) { repository.send(:cache) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(repository).to receive(:cache).and_return(cache)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'without a branch or revision' do
|
|
|
|
it 'flushes the cache' do
|
|
|
|
expect(cache).to receive(:expire).with(:avatar)
|
|
|
|
|
|
|
|
repository.expire_avatar_cache
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with a branch' do
|
|
|
|
it 'does not flush the cache if the branch is not the default branch' do
|
|
|
|
expect(cache).not_to receive(:expire)
|
|
|
|
|
|
|
|
repository.expire_avatar_cache('cats')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the cache if the branch equals the default branch' do
|
|
|
|
expect(cache).to receive(:expire).with(:avatar)
|
|
|
|
|
|
|
|
repository.expire_avatar_cache(repository.root_ref)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with a branch and revision' do
|
|
|
|
let(:commit) { double(:commit) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
allow(repository).to receive(:commit).and_return(commit)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not flush the cache if the commit does not change any logos' do
|
|
|
|
diff = double(:diff, new_path: 'test.txt')
|
|
|
|
|
|
|
|
expect(commit).to receive(:diffs).and_return([diff])
|
|
|
|
expect(cache).not_to receive(:expire)
|
|
|
|
|
|
|
|
repository.expire_avatar_cache(repository.root_ref, '123')
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'flushes the cache if the commit changes any of the logos' do
|
|
|
|
diff = double(:diff, new_path: Repository::AVATAR_FILES[0])
|
|
|
|
|
|
|
|
expect(commit).to receive(:diffs).and_return([diff])
|
|
|
|
expect(cache).to receive(:expire).with(:avatar)
|
|
|
|
|
|
|
|
repository.expire_avatar_cache(repository.root_ref, '123')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2016-03-17 13:15:09 -04:00
|
|
|
|
|
|
|
describe '#build_cache' do
|
|
|
|
let(:cache) { repository.send(:cache) }
|
|
|
|
|
|
|
|
it 'builds the caches if they do not already exist' do
|
|
|
|
expect(cache).to receive(:exist?).
|
|
|
|
exactly(repository.cache_keys.length).
|
|
|
|
times.
|
|
|
|
and_return(false)
|
|
|
|
|
|
|
|
repository.cache_keys.each do |key|
|
|
|
|
expect(repository).to receive(key)
|
|
|
|
end
|
|
|
|
|
|
|
|
repository.build_cache
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not build any caches that already exist' do
|
|
|
|
expect(cache).to receive(:exist?).
|
|
|
|
exactly(repository.cache_keys.length).
|
|
|
|
times.
|
|
|
|
and_return(true)
|
|
|
|
|
|
|
|
repository.cache_keys.each do |key|
|
|
|
|
expect(repository).to_not receive(key)
|
|
|
|
end
|
|
|
|
|
|
|
|
repository.build_cache
|
|
|
|
end
|
|
|
|
end
|
2014-09-29 09:40:13 -04:00
|
|
|
end
|