check for the page first

Author: stefannibrasil

spec/system/volunteers/edit_spec.rb

@@ -125,16 +125,15 @@
 
         fill_in "Email", with: "newemail@example.com"
         click_on "Submit"
-        volunteer.reload
+
+        expect(page).to have_text "Volunteer was successfully updated. Confirmation Email Sent."
+        expect(page).to have_field("Email", with: old_email)
+        expect(volunteer.reload.unconfirmed_email).to eq("newemail@example.com")
 
         expect(ActionMailer::Base.deliveries.count).to eq(1)
         expect(ActionMailer::Base.deliveries.first).to be_a(Mail::Message)
         expect(ActionMailer::Base.deliveries.first.body.encoded)
           .to match("Click here to confirm your email")
-
-        expect(page).to have_text "Volunteer was successfully updated. Confirmation Email Sent."
-        expect(page).to have_field("Email", with: old_email)
-        expect(volunteer.unconfirmed_email).to eq("newemail@example.com")
       end
 
       it "succesfully displays the new email once the user confirms" do
@@ -442,6 +441,8 @@
       uncheck "with_cc"
       click_on "Send Reminder"
 
+      expect(page).to have_content("Reminder sent to volunteer")
+
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first.cc).to be_empty
     end
@@ -456,6 +457,8 @@
       check "with_cc"
       click_on "Send Reminder"
 
+      expect(page).to have_content("Reminder sent to volunteer")
+
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first.cc).to include(volunteer.supervisor.email)
     end
@@ -471,6 +474,8 @@
       check "with_cc"
       click_on "Send Reminder"
 
+      expect(page).to have_content("Reminder sent to volunteer")
+
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first.cc).to be_empty
     end
@@ -490,6 +495,8 @@
 
       click_on "Send Reminder"
 
+      expect(page).to have_content("Reminder sent to volunteer")
+
       expect(ActionMailer::Base.deliveries.count).to eq(1)
     end
 
@@ -502,6 +509,8 @@
       visit edit_volunteer_path(volunteer)
       check "with_cc"
       click_on "Send Reminder"
+    
+      expect(page).to have_content("Reminder sent to volunteer")
 
       expect(ActionMailer::Base.deliveries.count).to eq(1)
       expect(ActionMailer::Base.deliveries.first.cc).to include(volunteer.supervisor.email)