diff options
author | Michael Kozono <mkozono@gmail.com> | 2018-02-15 14:22:38 -0800 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2018-02-16 14:40:53 -0800 |
commit | 293c51e39900efc8ea2e5ac77af680419f89862d (patch) | |
tree | a0509802b65314322baa92d6c0c81e30d3a26845 /spec/support | |
parent | 348c60d9be8b0e358d766c46e3e6d343af3e187a (diff) | |
download | gitlab-ce-293c51e39900efc8ea2e5ac77af680419f89862d.tar.gz |
Remove more BG migration spec dependencies
For the `PrepareUntrackedUploads` spec.
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/track_untracked_uploads_helpers.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/spec/support/track_untracked_uploads_helpers.rb b/spec/support/track_untracked_uploads_helpers.rb index 16aa30f9871..87a86dd21af 100644 --- a/spec/support/track_untracked_uploads_helpers.rb +++ b/spec/support/track_untracked_uploads_helpers.rb @@ -71,8 +71,8 @@ module TrackUntrackedUploadsHelpers ) end - def add_markdown_attachment(project) - project_dir = project_uploads_dir(project) + def add_markdown_attachment(project, hashed_storage: false) + project_dir = hashed_storage ? hashed_project_uploads_dir(project) : legacy_project_uploads_dir(project) attachment_dir = File.join(project_dir, SecureRandom.hex) attachment_file_path = File.join(attachment_dir, UPLOAD_FILENAME) project_attachment_path_relative_to_project = attachment_file_path.sub("#{project_dir}/", '') @@ -88,8 +88,13 @@ module TrackUntrackedUploadsHelpers ) end - def project_uploads_dir(project) - File.join(UPLOADS_DIR, project.full_path) + def legacy_project_uploads_dir(project) + namespace = namespaces.find_by(id: project.namespace_id) + File.join(UPLOADS_DIR, namespace.path, project.path) + end + + def hashed_project_uploads_dir(project) + File.join(UPLOADS_DIR, '@hashed', 'aa', 'aaaaaaaaaaaa') end def upload_file_path(model, model_type, attachment_type) |