diff options
author | Stan Hu <stanhu@gmail.com> | 2018-09-21 22:18:14 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2018-09-21 22:18:14 +0300 |
commit | 12e97d397cde568631eff20984714a20e8e78ebd (patch) | |
tree | e58a64b4f1e1447b023d1490afa3a81f0ae020fa /spec/models/project_spec.rb | |
parent | 00bb83f7fc6d52583d56fb0f0ea4c9d951535b52 (diff) | |
parent | 44bf0c776f50f51fd1b938915854096bd1365635 (diff) |
Merge branch '51725-push-mirrors-default-branch-reset-to-master' into 'master'
Doesn't synchronize default branch for push mirrors
Closes #51725
See merge request gitlab-org/gitlab-ce!21861
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r-- | spec/models/project_spec.rb | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 567b66b54eb..afc9ea1917e 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3995,40 +3995,6 @@ describe Project do end end - describe '#update_root_ref' do - let(:project) { create(:project, :repository) } - - it 'updates the default branch when HEAD has changed' do - stub_find_remote_root_ref(project, ref: 'feature') - - expect { project.update_root_ref('origin') } - .to change { project.default_branch } - .from('master') - .to('feature') - end - - it 'does not update the default branch when HEAD does not change' do - stub_find_remote_root_ref(project, ref: 'master') - - expect { project.update_root_ref('origin') } - .not_to change { project.default_branch } - end - - it 'does not update the default branch when HEAD does not exist' do - stub_find_remote_root_ref(project, ref: 'foo') - - expect { project.update_root_ref('origin') } - .not_to change { project.default_branch } - end - - def stub_find_remote_root_ref(project, ref:) - allow(project.repository) - .to receive(:find_remote_root_ref) - .with('origin') - .and_return(ref) - end - end - def rugged_config Gitlab::GitalyClient::StorageSettings.allow_disk_access do project.repository.rugged.config |