bug-4976 Defaults dropdown menu to use contact name when no business name is present

Author: Brian Bonus

app/views/donations/_donation_form.html.erb

@@ -41,7 +41,7 @@
                           collection: @product_drive_participants,
                           selected: donation_form.product_drive_participant_id,
                           include_blank: true,
-                          label_method: lambda { |x| "#{x.try(:business_name) }" },
+                          label_method: lambda { |x| "#{x.try(:business_name).presence || x.try(:contact_name)}" },
                           label: "Product Drive Participant",
                           error: "Which product drive participant was this from?",
                           wrapper: :input_group %>

spec/system/donation_system_spec.rb

@@ -161,6 +161,7 @@
         create(:donation_site, organization: organization)
         create(:product_drive, organization: organization)
         create(:product_drive_participant, organization: organization)
+        create(:product_drive_participant, organization: organization, contact_name: "contact without business name", business_name: "")
         create(:manufacturer, organization: organization)
         organization.reload
       end
@@ -248,6 +249,12 @@
           end.to change { Donation.count }.by(1)
         end
 
+        it "Displays ProductDrive Participants sources by business name then contact name)", :focus => true do
+          select Donation::SOURCES[:product_drive], from: "donation_source"
+          select ProductDrive.first.name, from: "donation_product_drive_id"
+          expect(page).to have_select('donation_product_drive_participant_id', with_options: ['contact without business name'])
+        end
+
         it "Allows User to create a Product Drive from donation" do
           select Donation::SOURCES[:product_drive], from: "donation_source"
           select "---Create new Product Drive---", from: "donation_product_drive_id"