FIX: Multisite spec was failing in parallel environment

FIX: Multisite spec was failing in parallel environment

We were not adding the test number to the path in all places.

diff --git a/lib/s3_helper.rb b/lib/s3_helper.rb
index 15e137b..5763921 100644
--- a/lib/s3_helper.rb
+++ b/lib/s3_helper.rb
@@ -247,7 +247,9 @@ class S3Helper
   end
 
   def multisite_upload_path
-    File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")
+    path = File.join("uploads", RailsMultisite::ConnectionManagement.current_db, "/")
+    return path unless Discourse.is_parallel_test?
+    File.join(path, ENV['TEST_ENV_NUMBER'].presence || '1', "/")
   end
 
   def s3_resource

GitHub sha: 80a572d3