Download as
Browse Code »

Commit 961101beb00486502a0f766eedf2d7873a311c99

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 08a13702
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

Avoid exception_notification plugin to try load 404.html 

(ActionItem1837)
Showing 2 changed files with 6 additions and 0 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @961101b
@@ -131,6 +131,7 @@ class ApplicationController < ActionController::Base @@ -131,6 +131,7 @@ class ApplicationController < ActionController::Base
131 @path ||= request.path 131 @path ||= request.path
132 render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout 132 render :template => 'shared/not_found.rhtml', :status => 404, :layout => get_layout
133 end 133 end
  134 + alias :render_404 :render_not_found
134 135
135 def render_access_denied(message = nil, title = nil) 136 def render_access_denied(message = nil, title = nil)
136 @no_design_blocks = true 137 @no_design_blocks = true
test/integration/exception_notification_test.rb
  Diff comments   View file @961101b
@@ -25,4 +25,9 @@ class ExceptionNotificationTest < ActionController::IntegrationTest @@ -25,4 +25,9 @@ class ExceptionNotificationTest < ActionController::IntegrationTest
25 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'admin@example.com' 25 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'admin@example.com'
26 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'user@example.com' 26 assert_includes ActionMailer::Base.deliveries.map(&:to).flatten, 'user@example.com'
27 end 27 end
  28 +
  29 + should 'render not found when try to access invalid url' do
  30 + get '/profile/ze/tag/notexists'
  31 + assert_template 'not_found.rhtml'
  32 + end
28 end 33 end