5 files changed, 37 insertions, 9 deletions
diff --git a/spec/fixtures/files/raw_emails/3.email b/spec/fixtures/files/raw_emails/3.email
new file mode 100644
index 000000000..a6e780fe5
--- /dev/null
+++ b/spec/fixtures/files/raw_emails/3.email
@@ -0,0 +1,19 @@
+From: "The Minister" <msw@localhost>
+To: "Bob Smith" <bob@localhost>
+Date: Tue, 13 Nov 2009 11:39:55 +0000
+Bcc: 
+Subject: Re: Your message
+Reply-To: 
+In-Reply-To: <471f1eae5d1cb_7347..fdbe67386165@cat.tmail>
+Content-Type: text/plain; charset=utf-8
+
+Dear “Bob”,
+
+In the financial year 2010–2011, this Ministry spent precisely
+no money at all on the purchase or repair of boring equipment.
+
+Yours most sincerely,
+
+Martin Kibble-von Scratsching,
+Chief Assistant to the Assistant Chief,
+Ministry of Silly Walks
diff --git a/spec/fixtures/incoming_messages.yml b/spec/fixtures/incoming_messages.yml
index a32052413..918d4fd11 100644
--- a/spec/fixtures/incoming_messages.yml
+++ b/spec/fixtures/incoming_messages.yml
@@ -14,7 +14,7 @@ useful_incoming_message:
 
 another_useful_incoming_message:
     id: 3
-    info_request_id: 105
-    raw_email_id: 2
+    info_request_id: 106
+    raw_email_id: 3
     created_at: 2007-11-13 18:09:20
     updated_at: 2007-11-13 18:09:20
diff --git a/spec/fixtures/info_request_events.yml b/spec/fixtures/info_request_events.yml
index ec6abbf57..3fdeb16e9 100644
--- a/spec/fixtures/info_request_events.yml
+++ b/spec/fixtures/info_request_events.yml
@@ -1,37 +1,37 @@
 useless_outgoing_message_event:
+  id: 900
   params_yaml: "--- \n\
     :outgoing_message_id: 1\n"
-  id: 900
   info_request_id: 101
   event_type: sent
   created_at: 2007-10-12 01:56:58.586598
   described_state:
   outgoing_message_id: 1
 silly_outgoing_message_event:
+  id: 901
   params_yaml: "--- \n\
     :outgoing_message_id: 2\n"
-  id: 901
   info_request_id: 103
   event_type: sent
   created_at: 2007-10-14 10:41:12.686264
   described_state:
   outgoing_message_id: 2
 useless_incoming_message_event: 
+  id: 902
   params_yaml: "--- \n\
     :incoming_message_id: 1\n"
-  id: 902
   info_request_id: 101
   event_type: response
   created_at: 2007-11-13 18:09:20.042061
   described_state:
   incoming_message_id: 1
 silly_comment_event: 
+  id: 903
   params_yaml: "--- \n\
     :comment_id: 1\n"
   incoming_message_id: 
   last_described_at: 
   described_state: 
-  id: "903"
   info_request_id: 101
   comment_id: 1
   calculated_state: 
@@ -39,9 +39,9 @@ silly_comment_event:
   outgoing_message_id: 
   created_at: 2008-08-12 23:05:12.500942
 badger_outgoing_message_event:
+  id: 904
   params_yaml: "--- \n\
     :outgoing_message_id: 3\n"
-  id: 904
   info_request_id: 104
   event_type: sent
   created_at: 2011-10-12 01:56:58.586598
@@ -92,7 +92,7 @@ another_useful_incoming_message_event:
   described_state: successful
   calculated_state: successful
 
-another_comment_event: 
+another_comment_event:
   id: 909
   info_request_id: 105
   comment_id: 2
diff --git a/spec/fixtures/public_bodies.yml b/spec/fixtures/public_bodies.yml
index 737fe203f..2ac99f99e 100644
--- a/spec/fixtures/public_bodies.yml
+++ b/spec/fixtures/public_bodies.yml
@@ -16,7 +16,7 @@ humpadink_public_body:
   updated_at: 2007-10-25 10:51:01.161639
   last_edit_comment: Not sure what this new department does.
   request_email: humpadink-requests@localhost
-  id: "3"
+  id: 3
   version: "2"
   last_edit_editor: "francis"
   short_name: DfH
diff --git a/spec/fixtures/raw_emails.yml b/spec/fixtures/raw_emails.yml
index 32e039cab..6c5b6a6bb 100644
--- a/spec/fixtures/raw_emails.yml
+++ b/spec/fixtures/raw_emails.yml
@@ -1,5 +1,14 @@
+# The actual email messages are in fixtures/files/raw_emails
+#
+# Note that the words "money" and "bob" are used in some tests
+# of the search functions, so if you use either of these words
+# in the email text then some tests will have to be updated.
+
 useless_raw_email: 
   id: 1
 
 useful_raw_email: 
   id: 2
+
+another_useful_raw_email: 
+  id: 3