From f00510286b6ccda154c4926503397590a8851939 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 4 Apr 2023 12:15:02 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/uploaders/personal_file_uploader_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/uploaders/personal_file_uploader_spec.rb') diff --git a/spec/uploaders/personal_file_uploader_spec.rb b/spec/uploaders/personal_file_uploader_spec.rb index 1373ccac23d..58edf3f093d 100644 --- a/spec/uploaders/personal_file_uploader_spec.rb +++ b/spec/uploaders/personal_file_uploader_spec.rb @@ -50,9 +50,9 @@ RSpec.describe PersonalFileUploader do context 'object_store is LOCAL' 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+$] + 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+$] it_behaves_like '#base_dir' it_behaves_like '#to_h' @@ -66,8 +66,8 @@ RSpec.describe PersonalFileUploader do include_context 'with storage', described_class::Store::REMOTE it_behaves_like 'builds correct paths', - store_dir: %r[\d+/\h+], - upload_path: %r[^personal_snippet/\d+/\h+/] + store_dir: %r[\d+/\h+], + upload_path: %r[^personal_snippet/\d+/\h+/] it_behaves_like '#base_dir' it_behaves_like '#to_h' -- cgit v1.2.3