Merge branch 'release/0.15' into wdtk

Conflicts:
	lib/tasks/stats.rake

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index 09789f429..cf4dda62c 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -797,6 +797,16 @@ describe InfoRequest do
         end
     end
 
+    describe 'when working out a subject for request emails' do
+
+        it 'should create a standard request subject' do
+            info_request = FactoryGirl.build(:info_request)
+            expected_text = "Freedom of Information request - #{info_request.title}"
+            info_request.email_subject_request.should == expected_text
+        end
+
+    end
+
     describe 'when working out a subject for a followup emails' do
 
         it "should not be confused by an nil subject in the incoming message" do