summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-18 12:48:23 -0500
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-05-18 12:48:23 -0500
commit253a017b0173ae12d83dc4c6976f1b0a838448a6 (patch)
treef19de62135aac3aa12f0e4998516c3be4007ea77 /spec/controllers
parent4ade5ff42511d7931bebb28098c2dc2192caba3e (diff)
parent6a0ea605e8b48deacbb4e93f7bb1d9b9abd2f7f4 (diff)
downloadgitlab-ce-253a017b0173ae12d83dc4c6976f1b0a838448a6.tar.gz
Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/raw_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/raw_controller_spec.rb b/spec/controllers/projects/raw_controller_spec.rb
index 1caa476d37d..fb29274c687 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
before do
public_project.lfs_objects << lfs_object
allow_any_instance_of(LfsObjectUploader).to receive(:exists?).and_return(true)
- allow(controller).to receive(:send_file) { controller.render nothing: true }
+ allow(controller).to receive(:send_file) { controller.head :ok }
end
it 'serves the file' do