diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-26 21:40:55 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-06-26 21:40:55 +0000 |
commit | 3807840db3c78d21fd3b38d62ad30e568970936e (patch) | |
tree | a6ec3c6184fabb70912c23142b4962a070c35389 /spec/controllers/snippets_controller_spec.rb | |
parent | 8a68acf7e138f7d30d5330b4bb8905becd67cc4e (diff) | |
parent | 25e83400cd024c5e0f9dab0b1b772c2adb0d8c8d (diff) | |
download | gitlab-ce-3807840db3c78d21fd3b38d62ad30e568970936e.tar.gz |
Merge branch 'security-persist-tmp-snippet-uploads-12-0' into '12-0-stable'
Persist tmp snippet uploads at users
See merge request gitlab/gitlabhq!3162
Diffstat (limited to 'spec/controllers/snippets_controller_spec.rb')
-rw-r--r-- | spec/controllers/snippets_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/snippets_controller_spec.rb b/spec/controllers/snippets_controller_spec.rb index f8666a1986f..3aba02bf3ff 100644 --- a/spec/controllers/snippets_controller_spec.rb +++ b/spec/controllers/snippets_controller_spec.rb @@ -209,8 +209,8 @@ describe SnippetsController do context 'when the snippet description contains a file' do include FileMoverHelpers - let(:picture_file) { '/-/system/temp/secret56/picture.jpg' } - let(:text_file) { '/-/system/temp/secret78/text.txt' } + let(:picture_file) { "/-/system/user/#{user.id}/secret56/picture.jpg" } + let(:text_file) { "/-/system/user/#{user.id}/secret78/text.txt" } let(:description) do "Description with picture: ![picture](/uploads#{picture_file}) and "\ "text: [text.txt](/uploads#{text_file})" |