diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 21:07:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 21:07:55 +0300 |
| commit | 603c7d4cac5e28bc1c75e50c23ed2cbe56f1aafc (patch) | |
| tree | 907f5b8ee1b6f5aad396e95e3327a08400b9e8ea /spec/uploaders/content_type_whitelist_spec.rb | |
| parent | 120f4aaedc8fe830a3f572491d240d8ee6addefb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/uploaders/content_type_whitelist_spec.rb')
| -rw-r--r-- | spec/uploaders/content_type_whitelist_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/uploaders/content_type_whitelist_spec.rb b/spec/uploaders/content_type_whitelist_spec.rb index be519ead1c8..4689f83759d 100644 --- a/spec/uploaders/content_type_whitelist_spec.rb +++ b/spec/uploaders/content_type_whitelist_spec.rb @@ -18,6 +18,7 @@ describe ContentTypeWhitelist do let(:path) { File.join('spec', 'fixtures', 'rails_sample.jpg') } it_behaves_like 'accepted carrierwave upload' + it_behaves_like 'upload with content type', 'image/jpeg' end context 'upload non-whitelisted file content type' do |