Fix sporadic spurious test failures

...by forcing the IncomingMessage to be re-parsed after we have
edited it.

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/outgoing_mailer_spec.rb b/spec/models/outgoing_mailer_spec.rb
index 75c8053b4..c5fde93fc 100644
--- a/spec/models/outgoing_mailer_spec.rb
+++ b/spec/models/outgoing_mailer_spec.rb
@@ -24,6 +24,7 @@ describe OutgoingMailer, " when working out follow up addresses" do
         im = ir.incoming_messages[0]
 
         im.raw_email.data = im.raw_email.data.sub("\"FOI Person\" <foiperson@localhost>", "foiperson@localhost")
+        im.parse_raw_email! true
 
         # check the basic entry in the fixture is fine
         OutgoingMailer.name_and_email_for_followup(ir, im).should == "foiperson@localhost"
@@ -36,6 +37,7 @@ describe OutgoingMailer, " when working out follow up addresses" do
         im = ir.incoming_messages[0]
 
         im.raw_email.data = im.raw_email.data.sub("FOI Person", "FOI [ Person")
+        im.parse_raw_email! true
 
         # check the basic entry in the fixture is fine
         OutgoingMailer.name_and_email_for_followup(ir, im).should == "\"FOI [ Person\" <foiperson@localhost>"
@@ -48,6 +50,7 @@ describe OutgoingMailer, " when working out follow up addresses" do
         im = ir.incoming_messages[0]
 
         im.raw_email.data = im.raw_email.data.sub("FOI Person", "FOI \\\" Person")
+        im.parse_raw_email! true
 
         # check the basic entry in the fixture is fine
         OutgoingMailer.name_and_email_for_followup(ir, im).should == "\"FOI \\\" Person\" <foiperson@localhost>"
@@ -60,6 +63,7 @@ describe OutgoingMailer, " when working out follow up addresses" do
         im = ir.incoming_messages[0]
 
         im.raw_email.data = im.raw_email.data.sub("FOI Person", "FOI @ Person")
+        im.parse_raw_email! true
 
         # check the basic entry in the fixture is fine
         OutgoingMailer.name_and_email_for_followup(ir, im).should == "\"FOI @ Person\" <foiperson@localhost>"
@@ -116,6 +120,8 @@ describe OutgoingMailer, "when working out follow up subjects" do
         om.incoming_message_followup = im
 
         im.raw_email.data = im.raw_email.data.sub("Subject: Geraldine FOI Code AZXB421", "Subject: re: Geraldine FOI Code AZXB421")
+        im.parse_raw_email! true
+        
         OutgoingMailer.subject_for_followup(ir, om).should == "re: Geraldine FOI Code AZXB421"
     end
 
@@ -127,6 +133,8 @@ describe OutgoingMailer, "when working out follow up subjects" do
 
         im.raw_email.data = im.raw_email.data.sub("foiperson@localhost", "postmaster@localhost")
         im.raw_email.data = im.raw_email.data.sub("Subject: Geraldine FOI Code AZXB421", "Subject: Delivery Failed")
+        im.parse_raw_email! true
+
         OutgoingMailer.subject_for_followup(ir, om).should == "Re: Freedom of Information request - Why do you have & such a fancy dog?"
     end
 end