Fix for purging of cached attachments for non-default locales.0.17.0.4hotfix/0.17.0.4

2 files changed, 31 insertions, 0 deletions

diff --git a/spec/integration/alaveteli_dsl.rb b/spec/integration/alaveteli_dsl.rb
index 119bb05a0..1d56abbdf 100644
--- a/spec/integration/alaveteli_dsl.rb
+++ b/spec/integration/alaveteli_dsl.rb
@@ -64,5 +64,14 @@ def close_request(request)
     request.save!
 end
 
+def cache_directories_exist?(request)
+    cache_path = File.join(Rails.root, 'cache', 'views')
+    paths = [File.join(cache_path, 'request', request.request_dirs)]
+    I18n.available_locales.each do |locale|
+        paths << File.join(cache_path, locale.to_s, 'request', request.request_dirs)
+    end
+    paths.any?{ |path| File.exist?(path) }
+end
+
 
 
diff --git a/spec/integration/view_request_spec.rb b/spec/integration/view_request_spec.rb
index 814e20fb3..eecb984f5 100644
--- a/spec/integration/view_request_spec.rb
+++ b/spec/integration/view_request_spec.rb
@@ -19,6 +19,28 @@ describe "When viewing requests" do
        @unregistered.browses_request("#{@info_request.url_title}?action=add")
     end
 
+    context "when a request is hidden by an admin" do
+
+        it 'should not retain any cached attachments to be served up by the webserver' do
+            admin = login(FactoryGirl.create(:admin_user))
+            non_owner = login(FactoryGirl.create(:user))
+            info_request = FactoryGirl.create(:info_request_with_incoming_attachments)
+            incoming_message = info_request.incoming_messages.first
+            attachment_url = "/es/request/#{info_request.id}/response/#{incoming_message.id}/attach/2/interesting.pdf"
+            non_owner.get(attachment_url)
+            cache_directories_exist?(info_request).should be_true
+
+            # Admin makes the incoming message requester only
+            post_data = {:incoming_message => {:prominence => 'hidden',
+                                               :prominence_reason => 'boring'}}
+            admin.post_via_redirect "/admin/incoming/update/#{info_request.incoming_messages.first.id}", post_data
+            admin.response.should be_success
+
+            cache_directories_exist?(info_request).should be_false
+        end
+
+    end
+
     context 'when a response has prominence "normal"' do
 
         before do