From 359d76c8f0983d6010a9d45e4481decd4a3e06d9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 22 Apr 2020 12:22:34 +0100 Subject: [PATCH] Redirect to the error page for non-existent issues --- app/controllers/issues_controller.rb | 2 +- test/controllers/issues_controller_test.rb | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index d136e7230..cd3584f02 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -82,6 +82,6 @@ class IssuesController < ApplicationController def find_issue @issue = Issue.visible_to(current_user).find(params[:id]) rescue ActiveRecord::RecordNotFound - head :not_found + redirect_to :controller => "errors", :action => "not_found" end end diff --git a/test/controllers/issues_controller_test.rb b/test/controllers/issues_controller_test.rb index 1dd423a7a..141c7b20d 100644 --- a/test/controllers/issues_controller_test.rb +++ b/test/controllers/issues_controller_test.rb @@ -42,7 +42,7 @@ class IssuesControllerTest < ActionController::TestCase # Access issue as administrator session[:user] = create(:administrator_user).id get :show, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found # Access issue as moderator session[:user] = create(:moderator_user).id @@ -68,7 +68,7 @@ class IssuesControllerTest < ActionController::TestCase # Access issue as moderator session[:user] = create(:moderator_user).id get :show, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found # Access issue as administrator session[:user] = create(:administrator_user).id @@ -94,7 +94,7 @@ class IssuesControllerTest < ActionController::TestCase # Resolve issue as administrator session[:user] = create(:administrator_user).id get :resolve, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found assert_not issue.reload.resolved? # Resolve issue as moderator @@ -122,7 +122,7 @@ class IssuesControllerTest < ActionController::TestCase # Resolve issue as moderator session[:user] = create(:moderator_user).id get :resolve, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found assert_not issue.reload.resolved? # Resolve issue as administrator @@ -150,7 +150,7 @@ class IssuesControllerTest < ActionController::TestCase # Ignore issue as administrator session[:user] = create(:administrator_user).id get :ignore, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found assert_not issue.reload.ignored? # Ignore issue as moderator @@ -178,7 +178,7 @@ class IssuesControllerTest < ActionController::TestCase # Ignore issue as moderator session[:user] = create(:moderator_user).id get :ignore, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found assert_not issue.reload.ignored? # Ignore issue as administrator @@ -208,7 +208,7 @@ class IssuesControllerTest < ActionController::TestCase # Reopen issue as administrator session[:user] = create(:administrator_user).id get :reopen, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found assert_not issue.reload.open? # Reopen issue as moderator @@ -238,7 +238,7 @@ class IssuesControllerTest < ActionController::TestCase # Reopen issue as moderator session[:user] = create(:moderator_user).id get :reopen, :params => { :id => issue.id } - assert_response :not_found + assert_redirected_to :controller => :errors, :action => :not_found assert_not issue.reload.open? # Reopen issue as administrator -- 2.43.2