diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-12-20 11:37:32 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-20 11:37:32 +0300 |
commit | 6e42fac3fb11c1c6143975dbe6c843a22cd4828f (patch) | |
tree | e864773b83993e567a069c0f6e30eccc1cdfdf33 /spec | |
parent | 5b880f0d36b082a0b443c5fe95f51a84dee27475 (diff) | |
parent | ac862490392b029ac4937188e02bdf09f4505869 (diff) |
Merge branch 'bvl-fix-unlinking-with-lfs-objects' into 'master'
Don't link LFS-objects multiple times.
Closes #41241
See merge request gitlab-org/gitlab-ce!16006
Diffstat (limited to 'spec')
-rw-r--r-- | spec/services/projects/unlink_fork_service_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/services/projects/unlink_fork_service_spec.rb b/spec/services/projects/unlink_fork_service_spec.rb index 2bba71fef4f..3ec6139bfa6 100644 --- a/spec/services/projects/unlink_fork_service_spec.rb +++ b/spec/services/projects/unlink_fork_service_spec.rb @@ -62,6 +62,26 @@ describe Projects::UnlinkForkService do expect(source.forks_count).to be_zero end + context 'when the source has LFS objects' do + let(:lfs_object) { create(:lfs_object) } + + before do + lfs_object.projects << project + end + + it 'links the fork to the lfs object before unlinking' do + subject.execute + + expect(lfs_object.projects).to include(forked_project) + end + + it 'does not fail if the lfs objects were already linked' do + lfs_object.projects << forked_project + + expect { subject.execute }.not_to raise_error + end + end + context 'when the original project was deleted' do it 'does not fail when the original project is deleted' do source = forked_project.forked_from_project |