use pluck, admin edit test tweak

rubyforgood · Oct 20, 2024 · 027f3a6 · 027f3a6
1 parent eb35c9c
commit 027f3a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/case_contacts/form_controller.rb b/app/controllers/case_contacts/form_controller.rb
@@ -55,7 +55,7 @@ def prepare_form
     @grouped_contact_types = group_contact_types_by_name(contact_types)
     @contact_topics = get_contact_topics
 
-    if @case_contact.contact_topic_answers.empty? && !@case_contact.active?
+    if !@case_contact.active? && @case_contact.contact_topic_answers.empty?
       if @contact_topics.present?
         @case_contact.contact_topic_answers.create
       end

diff --git a/app/views/case_contacts/form/details.html.erb b/app/views/case_contacts/form/details.html.erb
@@ -68,7 +68,7 @@
         Contact Type(s)<span class="red-letter">*</span>
       </h3>
       <div id="contact-form-types" class="mb-3">
-        <% casa_case_ids = @casa_cases.collect(&:id) %>
+        <% casa_case_ids = @casa_cases.pluck(:id) %>
         <% @grouped_contact_types.each do |group_name, contact_types| %>
           <fieldset class="form-group">
             <legend><%= group_name %></legend>

diff --git a/spec/system/case_contacts/edit_spec.rb b/spec/system/case_contacts/edit_spec.rb
@@ -15,7 +15,6 @@
 
   context "when admin" do
     let(:admin) { create(:casa_admin, casa_org: organization) }
-    let(:case_contact) { create(:case_contact, duration_minutes: 105, casa_case:, creator: admin) }
 
     let(:user) { admin }
 
@@ -56,6 +55,7 @@
 
     it "does not allow volunteer address edit for case contact with ambiguous volunteer" do
       create(:case_assignment, casa_case:, volunteer: create(:volunteer, casa_org: organization))
+      case_contact.update!(creator: admin)
       expect(casa_case.volunteers).not_to include case_contact.creator
       expect(casa_case.volunteers.size).to be > 1