DEV: Restore UploadRecovery specs (#10543)

Originally disabled in 0c0192e. Upload specs now use separate paths for each spec worker.

Fixes an issue in UploadRecovery#recover_from_local – it didn't take into account the testing infix (e.g. test_0) in the uploads/tombstone paths.
This commit is contained in:
Jarek Radosz
2020-08-27 15:57:10 +02:00
committed by GitHub
parent 89cb537fae
commit 188d224303
2 changed files with 9 additions and 16 deletions

View File

@@ -95,21 +95,14 @@ class UploadRecovery
end
def recover_from_local(sha1:, user_id:)
public_path = Rails.root.join("public")
@paths ||= begin
Dir.glob(File.join(
public_path,
'uploads',
'tombstone',
RailsMultisite::ConnectionManagement.current_db,
Discourse.store.tombstone_dir,
'original',
'**',
'*.*'
)).concat(Dir.glob(File.join(
public_path,
'uploads',
RailsMultisite::ConnectionManagement.current_db,
Discourse.store.upload_path,
'original',
'**',
'*.*'