summaryrefslogtreecommitdiff
path: root/spec/requests/lfs_http_spec.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-02-02 14:00:21 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-02-02 14:00:21 +0000
commit54a575f1bbba44573ab92dc58a4242f1ee734c5d (patch)
tree0ee2afe8228f184f7ad28e74d86bff2c5965c4ae /spec/requests/lfs_http_spec.rb
parentc63af942e5baf7849a94fa99da8494bcba28e3f8 (diff)
parent36838a843e99f551c971ec7062327e114c8f0188 (diff)
downloadgitlab-ce-54a575f1bbba44573ab92dc58a4242f1ee734c5d.tar.gz
Merge branch '3867-port-to-ce' into 'master'
Port of gitlab-ee!3867 to CE See merge request gitlab-org/gitlab-ce!16775
Diffstat (limited to 'spec/requests/lfs_http_spec.rb')
-rw-r--r--spec/requests/lfs_http_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/lfs_http_spec.rb b/spec/requests/lfs_http_spec.rb
index bee918a20aa..930ef49b7f3 100644
--- a/spec/requests/lfs_http_spec.rb
+++ b/spec/requests/lfs_http_spec.rb
@@ -958,7 +958,7 @@ describe 'Git LFS API and storage' do
end
it 'responds with status 200, location of lfs store and object details' do
- expect(json_response['StoreLFSPath']).to eq("#{Gitlab.config.shared.path}/lfs-objects/tmp/upload")
+ expect(json_response['StoreLFSPath']).to eq(LfsObjectUploader.workhorse_upload_path)
expect(json_response['LfsOid']).to eq(sample_oid)
expect(json_response['LfsSize']).to eq(sample_size)
end
@@ -1075,7 +1075,7 @@ describe 'Git LFS API and storage' do
end
it 'with location of lfs store and object details' do
- expect(json_response['StoreLFSPath']).to eq("#{Gitlab.config.shared.path}/lfs-objects/tmp/upload")
+ expect(json_response['StoreLFSPath']).to eq(LfsObjectUploader.workhorse_upload_path)
expect(json_response['LfsOid']).to eq(sample_oid)
expect(json_response['LfsSize']).to eq(sample_size)
end