cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Redirect to the error page for non-existent issues

Browse source
This commit is contained in:
Tom Hughes 2020-04-22 12:22:34 +01:00
parent 1cb92c9d2a
commit 359d76c8f0
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View file

@ -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

16
test/controllers/issues_controller_test.rb
View file

@ -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