Help de-flaky some system tests

Author: h-m-m

spec/system/banners/new_spec.rb

@@ -19,14 +19,12 @@
     visit banners_path
     expect(page).to have_text("Volunteer Survey Announcement")
 
-    visit banners_path
     within "#banners" do
       click_on "Edit", match: :first
     end
     fill_in "Name", with: "Better Volunteer Survey Announcement"
     click_on "Submit"
 
-    visit banners_path
     expect(page).to have_text("Better Volunteer Survey Announcement")
 
     visit root_path
@@ -44,18 +42,15 @@
     fill_in_rich_text_area "banner_content", with: "Please fill out this survey."
     click_on "Submit"
 
-    visit banners_path
-    expect(page).to have_text("Expiring Announcement")
+    expect(page).to have_text("Expiring Announcement Yes in 7 days")
 
-    visit banners_path
     within "#banners" do
       click_on "Edit", match: :first
     end
-    fill_in "banner_expires_at", with: 2.days.from_now.strftime("%m%d%Y\t%I%M%P")
+    fill_in "banner_expires_at", with: 3.days.from_now.strftime("%m%d%Y\t%I%M%P")
     click_on "Submit"
 
-    visit banners_path
-    expect(page).to have_text("Expiring Announcement")
+    expect(page).to have_text("Expiring Announcement Yes in 3 days")
 
     visit root_path
     expect(page).to have_text("Please fill out this survey.")
@@ -94,7 +89,9 @@
         fill_in_rich_text_area "banner_content", with: "New active banner content."
         click_on "Submit"
 
-        visit banners_path
+        # We're still on the banners page
+        expect(page).to have_current_path(banners_path)
+
         within("table#banners") do
           already_existing_banner_row = find("tr", text: active_banner.name)
 

spec/system/case_contacts/additional_expenses_spec.rb

@@ -58,8 +58,7 @@
     expect(case_contact.want_driving_reimbursement).to be false
   end
 
-  # TODO: Fix this test
-  xit "can remove an expense" do
+  it "can remove an expense" do
     subject
     fill_in_contact_details
     check "Request travel or other reimbursement"
@@ -81,6 +80,7 @@
       expect(page).to have_field(class: "expense-amount-input", count: 2)
 
       click_on "Submit"
+      expect(page).to have_text('Case contact successfully created')
     }
       .to change(CaseContact.active, :count).by(1)
       .and change(AdditionalExpense, :count).by(2)

spec/system/case_contacts/contact_topic_answers_spec.rb

@@ -115,7 +115,7 @@ def notes_section
   context "when casa org has no contact topics" do
     let(:contact_topics) { [] }
 
-    xit "displays a field for contact.notes" do # TODO make test not flaky
+    it "displays a field for contact.notes" do
       subject
       expect(page).to have_no_button "Add Another Discussion Topic"
       expect(notes_section).to have_field "Additional Notes"
@@ -139,7 +139,10 @@ def notes_section
 
       fill_in "Additional Notes", with: "This is a fake a topic answer."
 
-      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)
 
       contact = CaseContact.active.last
       expect(contact.contact_topic_answers).to be_empty

spec/system/case_contacts/edit_spec.rb

@@ -171,7 +171,10 @@
 
       check "Create Another"
 
-      expect { click_on "Submit" }.to change(CaseContact.started, :count).by(1)
+      expect do
+        click_on "Submit"
+        expect(page).to have_text("successfully updated")
+      end.to change(CaseContact.started, :count).by(1)
       new_case_contact = CaseContact.last
       expect(new_case_contact.draft_case_ids).to match_array(case_contact_draft_ids)
       expect(page).to have_text "New Case Contact"

spec/system/case_groups/case_groups_spec.rb

@@ -20,16 +20,13 @@
 
     click_on "Submit"
 
-    visit case_groups_path
-    expect(page).to have_text("A family")
-
     within "#case-groups" do
+      expect(page).to have_text("A family")
       click_on "Edit", match: :first
     end
     fill_in "Name", with: "Another family"
     click_on "Submit"
 
-    visit case_groups_path
     expect(page).to have_text("Another family")
   end
 
@@ -49,9 +46,10 @@
 
     click_on "Submit"
 
-    visit case_groups_path
-    expect(page).to have_text(casa_case1.case_number)
-    expect(page).to have_text(casa_case2.case_number)
+    list_item_text =  find_all('table li').map &:text
+    expect(list_item_text.count).to be 2
+    expect(list_item_text[0]).to match casa_case1.case_number
+    expect(list_item_text[1]).to match casa_case2.case_number
 
     within "#case-groups" do
       click_on "Edit", match: :first
@@ -62,7 +60,6 @@
     end
     click_on "Submit"
 
-    visit case_groups_path
     expect(page).to have_text(casa_case1.case_number)
     expect(page).not_to have_text(casa_case2.case_number)
   end