diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-25 17:22:00 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-31 03:46:45 +0000 |
| commit | 960d0fda54f75ca6e856686f826cf2ef37d4eff5 (patch) | |
| tree | 43d8450a1fc8f9b00fa139faecdc30b1046f8db5 /features/steps/profile/profile.rb | |
| parent | d945b21268970fce423adcb003aabe8c86f3adc6 (diff) | |
| download | gitlab-ce-960d0fda54f75ca6e856686f826cf2ef37d4eff5.tar.gz | |
Merge branch '28917-contain-uploads-in-system-dir' into 'security'
Upload files into `public/upload/system` instead of `public/upload`
See merge request !2073
Diffstat (limited to 'features/steps/profile/profile.rb')
| -rw-r--r-- | features/steps/profile/profile.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index 24cfbaad7fe..254c26bb6af 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -36,7 +36,7 @@ class Spinach::Features::Profile < Spinach::FeatureSteps step 'I should see new avatar' do expect(@user.avatar).to be_instance_of AvatarUploader - expect(@user.avatar.url).to eq "/uploads/user/avatar/#{@user.id}/banana_sample.gif" + expect(@user.avatar.url).to eq "/uploads/system/user/avatar/#{@user.id}/banana_sample.gif" end step 'I should see the "Remove avatar" button' do |