fix: more deflaking

Author: elasticspoon

spec/system/casa_cases/edit_spec.rb

@@ -324,6 +324,8 @@ def sign_in_and_assign_volunteer
       context "when a volunteer is assigned to a case" do
         it "marks the volunteer as assigned and shows the start date of the assignment", :js do
           sign_in_and_assign_volunteer
+          expect(page).to have_content("Volunteer assigned to case")
+
           expect(casa_case.case_assignments.count).to eq 1
 
           unassign_button = page.find("button.btn-outline-danger")

spec/system/case_contacts/contact_topic_answers_spec.rb

@@ -48,8 +48,9 @@ def notes_section
       {question: topic_two.question, answer: "Second discussion topic answer."}
     ])
 
-    expect { click_on "Submit" }
-      .to change(CaseContact.active, :count).by(1)
+    click_on "Submit"
+    expect(page).to have_content("Case contact successfully created.")
+    expect(CaseContact.active.size).to eq 1
 
     case_contact = CaseContact.active.last
     expect(case_contact.reload.contact_topic_answers).to be_present
@@ -64,7 +65,7 @@ def notes_section
     subject
     fill_in_contact_details(contact_types: [contact_type.name])
 
-    expect {
+    expect do
       using_wait_time 6 do # autosave debounce may be longer than capybara's wait time
         answer_topic contact_topics.first.question, "First discussion topic answer."
         within notes_section do
@@ -76,8 +77,8 @@ def notes_section
       end
 
       click_on "Submit"
-    }
-      .to change(CaseContact.active, :count).by(1)
+      expect(page).to have_content("Case contact successfully created.")
+    end.to change(CaseContact.active, :count).by(1)
       .and change(ContactTopicAnswer, :count).by(0) # answer already exists on page load
 
     case_contact = CaseContact.active.last
@@ -122,7 +123,10 @@ def notes_section
       fill_in_contact_details
       fill_in "Additional Notes", with: "This is a note."
 
-      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+      expect do
+        click_on "Submit"
+        expect(page).to have_content("Case contact successfully created.")
+      end.to change(CaseContact.active, :count).by(1)
 
       contact = CaseContact.active.last
       expect(contact.contact_topic_answers).to be_empty
@@ -188,6 +192,7 @@ def notes_section
           expect(notes_section).to have_select(class: topic_select_class, count: 1, visible: :all)
 
           click_on "Submit"
+          expect(page).to have_content(/Case contact .* was successfully updated./)
         }
           .to change(ContactTopicAnswer, :count).by(-1)
 

spec/system/case_contacts/new_spec.rb

@@ -70,9 +70,10 @@
         hours: 1, minutes: 45
       )
 
-      expect { click_on "Submit" }.not_to change(CaseContact, :count)
-
-      expect(page).to have_text("Medium type can't be blank")
+      expect do
+        click_on "Submit"
+        expect(page).to have_text("Medium type can't be blank")
+      end.not_to change(CaseContact, :count)
 
       expect(page).to have_field("case_contact_duration_hours", with: 1)
       expect(page).to have_field("case_contact_duration_minutes", with: 45)
@@ -83,15 +84,21 @@
 
   describe "contact types" do
     # TODO: Fix this test
-    xit "requires a contact type" do
+    it "requires a contact type" do
       subject
 
       fill_in_contact_details(contact_types: nil)
 
-      expect { click_on "Submit" }.to not_change(CaseContact.active, :count)
-      expect(page).to have_text("Contact Type must be selected")
+      expect do
+        click_on "Submit"
+        expect(page).to have_text("Contact Type must be selected")
+      end.to not_change(CaseContact.active, :count)
+
       check contact_types.first.name
-      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+      expect do
+        click_on "Submit"
+        expect(page).to have_text("Case contact successfully created.")
+      end.to change(CaseContact.active, :count).by(1)
     end
 
     it "does not display empty contact groups or hidden contact types" do
@@ -180,7 +187,7 @@
 
     context "when org has no contact topics" do
       # TODO: Fix this test
-      xit "allows entering contact notes" do
+      it "allows entering contact notes" do
         expect(casa_org.contact_topics.size).to eq 0
         subject
 
@@ -190,6 +197,7 @@
 
         expect {
           click_on "Submit"
+          expect(page).to have_text("Case contact successfully created.")
         }.to change(CaseContact.active, :count).by(1)
 
         case_contact = CaseContact.active.last
@@ -268,14 +276,17 @@
       fill_in volunteer_address_input, with: "123 Example St"
       uncheck reimbursement_checkbox
 
-      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+      expect {
+        click_on "Submit"
+        expect(page).to have_text("Case contact successfully created.")
+      }.to change(CaseContact.active, :count).by(1)
       case_contact = CaseContact.active.last
 
       expect(case_contact.want_driving_reimbursement).to be false
       expect(case_contact.miles_driven).to be_zero
     end
 
-    xit "saves mileage and address information" do # TODO make test not flaky
+    it "saves mileage and address information" do # TODO make test not flaky
       subject
       fill_in_contact_details contact_types: %w[School]
 
@@ -284,7 +295,10 @@
       fill_in miles_driven_input, with: 50
       fill_in volunteer_address_input, with: "123 Example St"
 
-      expect { click_on "Submit" }.to change(CaseContact.active, :count).by(1)
+      expect {
+        click_on "Submit"
+        expect(page).to have_text("Case contact successfully created.")
+      }.to change(CaseContact.active, :count).by(1)
       case_contact = CaseContact.active.last
 
       expect(case_contact.want_driving_reimbursement).to be true
@@ -310,8 +324,10 @@
 
       check reimbursement_checkbox
 
-      expect { click_on "Submit" }.not_to change(CaseContact.active, :count)
-      expect(page).to have_text("Must enter a valid mailing address for the reimbursement")
+      expect {
+        click_on "Submit"
+        expect(page).to have_text("Must enter a valid mailing address for the reimbursement")
+      }.not_to change(CaseContact.active, :count)
       expect(page).to have_text("Must enter miles driven to receive driving reimbursement")
     end
 
@@ -391,7 +407,10 @@
       )
 
       check "Create Another"
-      expect { click_on "Submit" }
+      expect {
+        click_on "Submit"
+        expect(page).to have_text "Case contact successfully created."
+      }
         .to change(CaseContact, :count).by(1)
       # .to change(CaseContact.active, :count).by(1)
       # .and change(CaseContact.started, :count).by(1)
@@ -441,6 +460,7 @@
       it "redirects to the new CaseContact form with the same cases selected" do
         expect {
           visit new_case_contact_path(casa_case, {draft_case_ids:})
+          expect(page).to have_content("Record New Case Contact")
         }.to change(CaseContact.started, :count).by(1)
         this_case_contact = CaseContact.started.last
 
@@ -452,6 +472,7 @@
 
         expect {
           click_on "Submit"
+          expect(page).to have_text "Case contacts successfully created."
         }.to change(CaseContact.active, :count).by(2)
 
         expect(page).to have_text "New Case Contact"
@@ -516,6 +537,7 @@
 
       expect {
         click_on "Submit"
+        expect(page).to have_text "Case contact successfully created."
       }.to change(CaseContact.active, :count).by(1)
       contact = CaseContact.active.last
       expect(contact.casa_case_id).to eq casa_case.id