Merge branch 'release/0.5' into develop

Conflicts:
	lib/alaveteli_external_command.rb

1 files changed, 6 insertions, 3 deletions

diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb
index 705c1fff8..d03323445 100644
--- a/spec/integration/errors_spec.rb
+++ b/spec/integration/errors_spec.rb
@@ -46,10 +46,13 @@ describe "When rendering errors" do
         response.code.should == "500"
     end
     it "should render a 403 for attempts at directory listing for attachments" do
-        get("/request/5/response/4/attach/html/3/" )
-        response.code.should == "403"
-        get("/request/5/response/4/attach/html" )
+        # make a fake cache
+        foi_cache_path = File.join(File.dirname(__FILE__), '../../cache')
+        FileUtils.mkdir_p(File.join(foi_cache_path, "views/en/request/101/101/response/1/attach/html/1"))
+        get("/request/101/response/1/attach/html/1/" )
         response.code.should == "403"
+        get("/request/101/response/1/attach/html" )
+        response.code.should == "403" 
     end
     it "should render a 404 for non-existent 'details' pages for requests" do
         get("/details/request/wobble" )