3 files changed, 32 insertions, 1 deletions
diff --git a/app/views/contact_mailer/from_admin_message.text.erb b/app/views/contact_mailer/from_admin_message.text.erb
index 4169d8d3a..3af759c5d 100644
--- a/app/views/contact_mailer/from_admin_message.text.erb
+++ b/app/views/contact_mailer/from_admin_message.text.erb
@@ -1,2 +1 @@
 <%= raw @message %>
-
diff --git a/config/general.yml-example b/config/general.yml-example
index b8d9fc854..b8c805533 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -172,6 +172,11 @@ VARNISH_HOST: localhost
 # Adding a value here will enable Google Analytics on all non-admin pages for non-admin users.
 GA_CODE: ''
 
+# We need to add the WDTK survey variables here, or else the deployment
+# system will cry.
+SURVEY_SECRET: ''
+SURVEY_URL: ''
+
 # If you want to override *all* the public body request emails with your own
 # email so that request emails that would normally go to the public body
 # go to you, then uncomment below and fill in your email.
diff --git a/spec/models/info_request_spec.rb b/spec/models/info_request_spec.rb
index dcc94e967..22ec1d6b7 100644
--- a/spec/models/info_request_spec.rb
+++ b/spec/models/info_request_spec.rb
@@ -550,6 +550,33 @@ 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 applying censor rules' do
 
         before do