github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1324 from dmathieu/no_error_on_invalid_format

Browse Source 
Don't raise an exception if the format isn't recognized
This commit is contained in:
José Valim
2011-05-26 02:29:23 -07:00
parent badc72f3e6 16571f9c42
commit ec08bfc035
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/metal/instrumentation.rb
View File

@@ -19,7 +19,7 @@ module ActionController
:controller => self.class.name,
:action => self.action_name,
:params => request.filtered_parameters,
:format => request.format.ref,
:format => request.format.try(:ref),
:method => request.method,
:path => (request.fullpath rescue "unknown")
}

6
actionpack/test/controller/mime_responds_test.rb
View File

@@ -498,6 +498,12 @@ class RespondToControllerTest < ActionController::TestCase
assert_equal '<html><div id="iphone">Hello iPhone future from iPhone!</div></html>', @response.body
assert_equal "text/html", @response.content_type
end
def test_invalid_format
get :using_defaults, :format => "invalidformat"
assert_equal " ", @response.body
assert_equal "text/html", @response.content_type
end
end
class RespondWithController < ActionController::Base