diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-06-27 10:53:06 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-07-19 22:28:27 -0500 |
| commit | 88df076fae9568314473de5fa6a0086c33663869 (patch) | |
| tree | c550f1809aa781e94304ca467388c487945cc302 /spec/controllers/uploads_controller_spec.rb | |
| parent | 3a7b724f6a03a19719b05b30e1e76e536230bcca (diff) | |
| download | gitlab-ce-88df076fae9568314473de5fa6a0086c33663869.tar.gz | |
Merge branch '33359-pers-snippet-files-location' into 'security-9-3'
Use uploads/system directory for personal snippets
See merge request !2123
Diffstat (limited to 'spec/controllers/uploads_controller_spec.rb')
| -rw-r--r-- | spec/controllers/uploads_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/uploads_controller_spec.rb b/spec/controllers/uploads_controller_spec.rb index 01a0659479b..96f719e2b82 100644 --- a/spec/controllers/uploads_controller_spec.rb +++ b/spec/controllers/uploads_controller_spec.rb @@ -102,7 +102,7 @@ describe UploadsController do subject expect(response.body).to match '\"alt\":\"rails_sample\"' - expect(response.body).to match "\"url\":\"/uploads/temp" + expect(response.body).to match "\"url\":\"/uploads/system/temp" end it 'does not create an Upload record' do @@ -119,7 +119,7 @@ describe UploadsController do subject expect(response.body).to match '\"alt\":\"doc_sample.txt\"' - expect(response.body).to match "\"url\":\"/uploads/temp" + expect(response.body).to match "\"url\":\"/uploads/system/temp" end it 'does not create an Upload record' do |