8 files changed, 94 insertions, 5 deletions
diff --git a/spec/fixtures/info_request_events.yml b/spec/fixtures/info_request_events.yml
index c1a00ad47..3907703d8 100644
--- a/spec/fixtures/info_request_events.yml
+++ b/spec/fixtures/info_request_events.yml
@@ -171,3 +171,14 @@ anonymous_external_outgoing_message_event:
   created_at: 2009-01-03 02:23:45.6789100
   described_state: waiting_response
   calculated_state: waiting_response
+
+other_request_outgoing_message_event:
+  id: 916
+  params_yaml: "--- \n\
+    :outgoing_message_id: 10\n"
+  outgoing_message_id: 10
+  info_request_id: 111
+  event_type: sent
+  created_at: <%= Time.now %>
+  described_state: waiting_response
+  calculated_state: waiting_response
diff --git a/spec/fixtures/info_requests.yml b/spec/fixtures/info_requests.yml
index 9361ec486..97effd036 100644
--- a/spec/fixtures/info_requests.yml
+++ b/spec/fixtures/info_requests.yml
@@ -107,3 +107,15 @@ anonymous_external_request:
     awaiting_description: false
     comments_allowed: true
     idhash: 7654321a
+other_request:
+    id: 111
+    title: Another request
+    url_title: another_request
+    created_at: 2010-01-01 02:23:45.6789100
+    updated_at: 2010-01-01 02:23:45.6789100
+    public_body_id: 7
+    user_id: 6
+    described_state: waiting_response
+    awaiting_description: false
+    comments_allowed: true
+    idhash: b234567
diff --git a/spec/fixtures/outgoing_messages.yml b/spec/fixtures/outgoing_messages.yml
index 55df8473e..c71ee08bf 100644
--- a/spec/fixtures/outgoing_messages.yml
+++ b/spec/fixtures/outgoing_messages.yml
@@ -108,3 +108,14 @@ anonymous_external_outgoing_message:
   updated_at: 2009-01-12 01:56:58.586598
   what_doing: normal_sort
 
+other_outgoing_message:
+  id: 10
+  info_request_id: 111
+  message_type: initial_request
+  status: sent
+  body: "Just another request"
+  last_sent_at: <%= Time.now %>
+  created_at: 2009-01-12 01:56:58.586598
+  updated_at: 2009-01-12 01:56:58.586598
+  what_doing: normal_sort
+
diff --git a/spec/fixtures/public_bodies.yml b/spec/fixtures/public_bodies.yml
index 615c4bcb6..65cba4b28 100644
--- a/spec/fixtures/public_bodies.yml
+++ b/spec/fixtures/public_bodies.yml
@@ -72,3 +72,18 @@ sensible_walks_public_body:
   created_at: 2008-10-25 10:51:01.161639
   api_key: 5
   info_requests_count: 1
+other_public_body:
+  id: 7
+  version: 1
+  name: 'Another Public Body'
+  first_letter: A
+  request_email: other@localhost
+  short_name: Another Public Body
+  url_name: another_public_body
+  notes: More notes
+  updated_at: 2008-10-25 10:51:01.161639
+  last_edit_comment: Another edit
+  last_edit_editor: louise
+  created_at: 2008-10-25 10:51:01.161639
+  api_key: 6
+  info_requests_count: 0
diff --git a/spec/fixtures/public_body_translations.yml b/spec/fixtures/public_body_translations.yml
index 24b14c470..61e07fb5b 100644
--- a/spec/fixtures/public_body_translations.yml
+++ b/spec/fixtures/public_body_translations.yml
@@ -88,3 +88,16 @@ sensible_walks_en_public_body_translation:
   notes: I bet you’ve never heard of it.
   publication_scheme: ""
   disclosure_log: ""
+
+other_public_body_translation:
+  id: 8
+  public_body_id: 7
+  locale: en
+  name: "Another Public Body"
+  first_letter: A
+  request_email: other@localhost
+  short_name: Another Public Body
+  url_name: another_public_body
+  notes: More notes
+  publication_scheme: ""
+  disclosure_log: ""
diff --git a/spec/fixtures/users.yml b/spec/fixtures/users.yml
index d6391c5e8..c9730d855 100644
--- a/spec/fixtures/users.yml
+++ b/spec/fixtures/users.yml
@@ -1,4 +1,4 @@
-bob_smith_user: 
+bob_smith_user:
   id: "1"
   name: Bob Smith
   url_name: bob_smith
@@ -13,7 +13,7 @@ bob_smith_user:
   locale: 'en'
   about_me: 'I like making requests about fancy dogs and naughty chickens and stuff.'
   receive_email_alerts: true
-silly_name_user: 
+silly_name_user:
   id: "2"
   name: "Silly <em>Name</em>"
   url_name: silly_emnameem
@@ -28,7 +28,7 @@ silly_name_user:
   locale: 'en'
   about_me: ''
   receive_email_alerts: true
-admin_user: 
+admin_user:
   id: "3"
   name: Joe Admin
   url_name: joe_admin
@@ -43,7 +43,7 @@ admin_user:
   locale: ''
   about_me: ''
   receive_email_alerts: true
-unconfirmed_user: 
+unconfirmed_user:
   id: "4"
   name: "Unconfirmed"
   url_name: unconfirmed
@@ -71,3 +71,17 @@ robin_user:
   ban_text: ''
   about_me: 'I am the best'
   receive_email_alerts: true
+another_user:
+  id: 6
+  name: Another User
+  url_name: another_user
+  email: another@localhost
+  salt: "-6116981980.392287733335677"
+  hashed_password: 6b7cd45a5f35fd83febc0452a799530398bfb6e8 # jonespassword
+  updated_at: 2012-01-01 10:39:15.491593
+  created_at: 2012-01-01 10:39:15.491593
+  email_confirmed: true
+  admin_level: 'none'
+  ban_text: ''
+  about_me: 'Just another user'
+  receive_email_alerts: true
diff --git a/spec/script/mailin_spec.rb b/spec/script/mailin_spec.rb
index f0bca2297..ac04dcfcf 100644
--- a/spec/script/mailin_spec.rb
+++ b/spec/script/mailin_spec.rb
@@ -5,7 +5,7 @@ def mailin_test(email_filename)
     Dir.chdir Rails.root do
         xc = ExternalCommand.new("script/mailin")
         mail = load_file_fixture(email_filename)
-        ir = info_requests(:boring_request)
+        ir = info_requests(:other_request)
         mail.gsub!('EMAIL_TO', ir.incoming_email)
         mail.gsub!('EMAIL_FROM', 'responder@localhost')
         xc.run(mail)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d63c81208..e05ef75dd 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,16 @@
+require 'simplecov'
+require 'coveralls'
+
+# Generate coverage locally in html as well as in coveralls.io
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start('rails') do
+  add_filter  'commonlib'
+  add_filter  'vendor/plugins'
+end
+
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] = 'test'