diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-31 14:41:14 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-31 14:41:14 -0700 |
| commit | 0329bab9d44b3a0fce630225b75458c61d3d198d (patch) | |
| tree | 612bc42b5d9a098d4867dcd648c53fe97c15b60b /actionpack | |
| parent | a52966f6123d6eb6b66db3c93bb565892f71c3cc (diff) | |
| parent | ba5fab4c015366e355ab92371b27e77e896124a4 (diff) | |
| download | rails-0329bab9d44b3a0fce630225b75458c61d3d198d.tar.gz rails-0329bab9d44b3a0fce630225b75458c61d3d198d.tar.bz2 rails-0329bab9d44b3a0fce630225b75458c61d3d198d.zip | |
Merge pull request #11912 from jonkessler/respond-to-signature-fixes
Update Rails::Railtie::Configuration and ActionDispatch::Response#respond_to? to accept include_private argument
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/response_test.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index d3696cbb8a..cf10190bd1 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -181,7 +181,7 @@ module ActionDispatch # :nodoc: end alias_method :status_message, :message - def respond_to?(method) + def respond_to?(method, include_private = false) if method.to_s == 'to_path' stream.respond_to?(:to_path) else diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb index 2fbe7358f9..4501ea095c 100644 --- a/actionpack/test/dispatch/response_test.rb +++ b/actionpack/test/dispatch/response_test.rb @@ -212,6 +212,11 @@ class ResponseTest < ActiveSupport::TestCase ActionDispatch::Response.default_headers = nil end end + + test "respond_to? accepts include_private" do + assert_not @response.respond_to?(:method_missing) + assert @response.respond_to?(:method_missing, true) + end end class ResponseIntegrationTest < ActionDispatch::IntegrationTest |