Merge branch 'release/0.5' of https://github.com/sebbacon/alaveteli into release/0.5

Conflicts:
	app/controllers/request_controller.rb

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/integration/errors_spec.rb b/spec/integration/errors_spec.rb
index bfb7e5fb5..8084bb35a 100644
--- a/spec/integration/errors_spec.rb
+++ b/spec/integration/errors_spec.rb
@@ -45,5 +45,13 @@ describe "When rendering errors" do
         get("/request/#{ir.url_title}")
         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"
+    end
+    it "should render a 404 for non-existent 'details' pages for requests" do
+        get("/details/request/wobble" )
+        response.code.should == "404"
+    end
 end