Merge branch 'hotfix/0.11.0.7' into wdtk

Conflicts:
    lib/tasks/temp.rake
    spec/models/info_request_spec.rb

1 files changed, 39 insertions, 0 deletions

diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index b2f0a20fc..56515bd99 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -564,5 +564,44 @@ describe InfoRequest do
 
     end
 
+    describe 'when an instance is asked if all can view it' do
+
+        before do
+            @info_request = InfoRequest.new
+        end
+
+        it 'should return true if its prominence is normal' do
+            @info_request.prominence = 'normal'
+            @info_request.all_can_view?.should == true
+        end
+
+        it 'should return true if its prominence is backpage' do
+            @info_request.prominence = 'backpage'
+            @info_request.all_can_view?.should == true
+        end
+
+        it 'should return false if its prominence is hidden' do
+            @info_request.prominence = 'hidden'
+            @info_request.all_can_view?.should == false
+        end
+
+        it 'should return false if its prominence is requester_only' do
+            @info_request.prominence = 'requester_only'
+            @info_request.all_can_view?.should == false
+        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
+            ir = info_requests(:fancy_dog_request)
+            im = mock_model(IncomingMessage,
+                            :subject => nil,
+                            :valid_to_reply_to? => true)
+            subject = ir.email_subject_followup im
+            subject.should match(/^Re: Freedom of Information request.*fancy dog/)
+        end
+
+    end
 
 end