Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-05-02 22:11:45 +0300
committerRobert Speicher <robert@gitlab.com>2018-05-02 22:11:45 +0300
commitab6dd3ac57dfff6472f6ecac21154fada9aa8d65 (patch)
tree36273df1ba7754757a2eb34454d61fd64c40a55a /spec/controllers/projects/raw_controller_spec.rb
parentb01221cc9e02c09fa259a5c4c71eb559e77816fe (diff)
parent9ec4b5c9b65f40a71ca94d2f318da4adf9309a2e (diff)
Merge branch '10-7-stable-patch-3' into '10-7-stable'
Prepare 10.7.3 release See merge request gitlab-org/gitlab-ce!18647
Diffstat (limited to 'spec/controllers/projects/raw_controller_spec.rb')
-rw-r--r--spec/controllers/projects/raw_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index 08e2ccf893a..c3468536ae1 100644
--- a/spec/controllers/projects/raw_controller_spec.rb
+++ b/spec/controllers/projects/raw_controller_spec.rb
@@ -54,9 +54,9 @@ describe Projects::RawController do
end
context 'and lfs uses object storage' do
+ let(:lfs_object) { create(:lfs_object, :with_file, oid: '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897', size: '1575078') }
+
before do
- lfs_object.file = fixture_file_upload(Rails.root + "spec/fixtures/dk.png", "`/png")
- lfs_object.save!
stub_lfs_object_storage
lfs_object.file.migrate!(LfsObjectUploader::Store::REMOTE)
end