diff options
| author | Luke Duncalfe <lduncalfe@eml.cc> | 2019-06-04 11:40:07 +1200 |
|---|---|---|
| committer | Luke Duncalfe <lduncalfe@eml.cc> | 2019-06-06 14:22:41 +1200 |
| commit | c7dcbc03bb71b954ab781a51736db29d687eac7b (patch) | |
| tree | 146dc6530f08ad748c82c556ed1752cf53e2b2d2 /spec/controllers | |
| parent | fabca7abc1d33ddbc069eb2441874a3c03e14d5e (diff) | |
| download | gitlab-ce-c7dcbc03bb71b954ab781a51736db29d687eac7b.tar.gz | |
CE backport for changes in EE MR 133899490-store-designs-in-lfs-ce
This backports to ce a refactor of the shared example 'a controller that
can serve LFS files'.
The ee MR that contains the original refactor is
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13389
The reason for the refactor was mostly the removal of the outer context
as it didn't need to be there, and prevented let(:lfs_oid) from being
overwritten.
The shared example was also renamed to be more descriptive.
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/avatars_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/raw_controller_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/avatars_controller_spec.rb b/spec/controllers/projects/avatars_controller_spec.rb index de1b9dc0bf3..d463619ad0b 100644 --- a/spec/controllers/projects/avatars_controller_spec.rb +++ b/spec/controllers/projects/avatars_controller_spec.rb @@ -39,7 +39,7 @@ describe Projects::AvatarsController do end context 'when the avatar is stored in lfs' do - it_behaves_like 'repository lfs file load' do + it_behaves_like 'a controller that can serve LFS files' do let(:filename) { 'lfs_object.iso' } let(:filepath) { "files/lfs/#{filename}" } end diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb index 3a89d8ce032..97acd47b4da 100644 --- a/spec/controllers/projects/raw_controller_spec.rb +++ b/spec/controllers/projects/raw_controller_spec.rb @@ -42,7 +42,7 @@ describe Projects::RawController do end end - it_behaves_like 'repository lfs file load' do + it_behaves_like 'a controller that can serve LFS files' do let(:filename) { 'lfs_object.iso' } let(:filepath) { "be93687/files/lfs/#{filename}" } end |
