diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 8 | ||||
| -rw-r--r-- | spec/integration/download_request_spec.rb | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index e7905e505..cd416a0c4 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -893,7 +893,7 @@ class RequestController < ApplicationController def render_hidden respond_to do |format| - response_code = 410 # gone + response_code = 403 # forbidden format.html{ render :template => 'request/hidden', :status => response_code } format.any{ render :nothing => true, :status => response_code } end @@ -902,7 +902,7 @@ class RequestController < ApplicationController def render_hidden_message respond_to do |format| - response_code = 410 # gone + response_code = 403 # forbidden format.html{ render :template => 'request/hidden_correspondence', :status => response_code } format.any{ render :nothing => true, :status => response_code } end diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index 854ce09c6..d324670c4 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -776,7 +776,7 @@ describe RequestController, "when handling prominence" do def expect_hidden(hidden_template) response.content_type.should == "text/html" response.should render_template(hidden_template) - response.code.should == '410' + response.code.should == '403' end context 'when the request is hidden' do @@ -800,7 +800,7 @@ describe RequestController, "when handling prominence" do it 'should not show request if requested using json' do session[:user_id] = @info_request.user.id get :show, :url_title => @info_request.url_title, :format => 'json' - response.code.should == '410' + response.code.should == '403' end it "should show request if logged in as super user" do @@ -1319,12 +1319,12 @@ describe RequestController, "when viewing an individual response for reply/follo response.should render_template('request/hidden') end - it 'should respond to a json request for a hidden request with a 410 code and no body' do + it 'should respond to a json request for a hidden request with a 403 code and no body' do get :show_response, :id => info_requests(:fancy_dog_request).id, :incoming_message_id => incoming_messages(:useless_incoming_message), :format => 'json' - response.code.should == '410' + response.code.should == '403' end end diff --git a/spec/integration/download_request_spec.rb b/spec/integration/download_request_spec.rb index 2af98c271..638198cde 100644 --- a/spec/integration/download_request_spec.rb +++ b/spec/integration/download_request_spec.rb @@ -186,7 +186,7 @@ describe 'when making a zipfile available' do end # Non-owner can't @non_owner.get_via_redirect "request/#{@info_request.url_title}/download" - @non_owner.response.code.should == '410' + @non_owner.response.code.should == '403' # Admin can inspect_zip_download(@admin, @info_request) do |zip| zip.count.should == 1 @@ -206,10 +206,10 @@ describe 'when making a zipfile available' do # Requester can't access the zip @request_owner.get_via_redirect "request/#{@info_request.url_title}/download" - @request_owner.response.code.should == '410' + @request_owner.response.code.should == '403' # Non-owner can't @non_owner.get_via_redirect "request/#{@info_request.url_title}/download" - @non_owner.response.code.should == '410' + @non_owner.response.code.should == '403' # Admin can inspect_zip_download(@admin, @info_request) do |zip| zip.count.should == 1 |