Upstream sync

spec/factories/appearance_releases.rb

@@ -58,10 +58,7 @@ FactoryBot.define do
       guardian_address_state "State"
       guardian_address_zip "ZIP"
       guardian_address_country "Country"
-      guardian_photo do
-        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
-        Rack::Test::UploadedFile.new(path, "image/jpeg")
-      end
+      with_guardian_photo
     end
 
     trait :without_person_photo do
@@ -74,6 +71,20 @@ FactoryBot.define do
       end
     end
 
+    trait :with_guardian_photo do
+      guardian_photo do
+        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
+        Rack::Test::UploadedFile.new(path, "image/jpeg")
+      end
+    end
+
+    trait :with_guardian_2_photo do
+      guardian_2_photo do
+        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
+        Rack::Test::UploadedFile.new(path, "image/jpeg")
+      end
+    end
+
     trait :with_person_photo_only do
     end
 

spec/factories/talent_releases.rb

@@ -35,12 +35,23 @@ FactoryBot.define do
       guardian_first_name "Jamie"
       guardian_last_name "Doe"
       guardian_phone "123-555-1234"
+      with_guardian_photo
+    end
+
+    trait :with_guardian_photo do
       guardian_photo do
         path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
         Rack::Test::UploadedFile.new(path, "image/jpeg")
       end
     end
 
+    trait :with_guardian_2_photo do
+      guardian_2_photo do
+        path = Rails.root.join("spec", "fixtures", "files", "pratt.jpg")
+        Rack::Test::UploadedFile.new(path, "image/jpeg")
+      end
+    end
+
     factory :talent_release_with_contract_template do
       after(:build) do |talent_release, _|
         talent_release.contract_template = build(:talent_release_contract_template)

spec/factories/task_requests.rb

@@ -0,0 +1,20 @@
+FactoryBot.define do
+  factory :task_request do
+    association :project
+    user_email 'test@email.com'
+    deadline { 10.days.from_now }
+    time_allowed 5
+    description "Task request"
+    additional_notes "Additional notes"
+    status 0
+    
+    trait :completed do
+      deliverable_url "example.com/deliverables"
+      status 1
+    end
+
+    trait :with_files do
+      files { [Rack::Test::UploadedFile.new('spec/fixtures/files/contract.pdf', 'application/pdf')] }
+    end
+  end
+end