Merge remote-tracking branch 'mysociety/develop' into rails-3-spike

Conflicts:
	Gemfile.lock
	Rakefile
	app/controllers/request_controller.rb
	lib/tasks/rspec.rake
	spec/controllers/services_controller_spec.rb
	spec/spec_helper.rb
	spec/views/request/_after_actions.rhtml_spec.rb

1 files changed, 17 insertions, 1 deletions

diff --git a/spec/views/request/_after_actions.rhtml_spec.rb b/spec/views/request/_after_actions.rhtml_spec.rb
index 54fef8cab..3ab79aa72 100644
--- a/spec/views/request/_after_actions.rhtml_spec.rb
+++ b/spec/views/request/_after_actions.rhtml_spec.rb
@@ -13,7 +13,8 @@ describe 'when displaying actions that can be taken with regard to a request' do
                                                 :is_external? => false,
                                                 :public_body => @mock_body,
                                                 :comments_allowed? => true,
-                                                :url_title => 'test_request')
+                                                :url_title => 'test_request',
+                                                :all_can_view? => true)
         assign :info_request, @mock_request
     end
 
@@ -68,4 +69,19 @@ describe 'when displaying actions that can be taken with regard to a request' do
         end
     end
 
+    describe 'if the request is viewable by all' do
+
+        it 'should display the link to download the entire request' do
+            expect_anyone_link('Download a zip file of all correspondence')
+        end
+    end
+
+    describe 'if the request is not viewable by all' do
+
+        it 'should not  display the link to download the entire request' do
+            @mock_request.stub!(:all_can_view?).and_return(false)
+            expect_no_anyone_link('Download a zip file of all correspondence')
+        end
+    end
+
 end