diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-08 03:07:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-08 03:07:09 +0300 |
commit | 044a953eb6b92e39cf32678296aa219176c9ad92 (patch) | |
tree | 01dafcb0cd46816b6aec864aed791c521c999a45 /spec/uploaders | |
parent | 23d78a2bf594e74fef0a9330d7a26bd9398ae4b9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/personal_file_uploader_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/uploaders/personal_file_uploader_spec.rb b/spec/uploaders/personal_file_uploader_spec.rb index d2eae5d7a54..1373ccac23d 100644 --- a/spec/uploaders/personal_file_uploader_spec.rb +++ b/spec/uploaders/personal_file_uploader_spec.rb @@ -43,8 +43,8 @@ RSpec.describe PersonalFileUploader do it 'builds correct paths for both local and remote storage' do paths = uploader.upload_paths('test.jpg') - expect(paths.first).to match(%r[\h+\/test.jpg]) - expect(paths.second).to match(%r[^personal_snippet\/\d+\/\h+\/test.jpg]) + expect(paths.first).to match(%r[\h+/test.jpg]) + expect(paths.second).to match(%r[^personal_snippet/\d+/\h+/test.jpg]) end end @@ -52,7 +52,7 @@ RSpec.describe PersonalFileUploader do it_behaves_like 'builds correct paths', store_dir: %r[uploads/-/system/personal_snippet/\d+/\h+], upload_path: %r[\h+/\S+], - absolute_path: %r[#{CarrierWave.root}/uploads/-/system/personal_snippet\/\d+\/\h+\/\S+$] + absolute_path: %r[#{CarrierWave.root}/uploads/-/system/personal_snippet/\d+/\h+/\S+$] it_behaves_like '#base_dir' it_behaves_like '#to_h' @@ -67,7 +67,7 @@ RSpec.describe PersonalFileUploader do it_behaves_like 'builds correct paths', store_dir: %r[\d+/\h+], - upload_path: %r[^personal_snippet\/\d+\/\h+\/<filename>] + upload_path: %r[^personal_snippet/\d+/\h+/<filename>] it_behaves_like '#base_dir' it_behaves_like '#to_h' |