diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d34ae7fc02..da981e6669 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Delegate xml_http_request in integration tests to the session instance. [Jamis Buck] + * Update the diagnostics template skip the useless '<controller not set>' text. [Nicholas Seckar] * CHANGED DEFAULT: Don't parse YAML input by default, but keep it available as an easy option [DHH] diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 54618ee68c..33ec1a0107 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -464,7 +464,7 @@ module ActionController @integration_session = open_session end - %w(get post cookies assigns).each do |method| + %w(get post cookies assigns xml_http_request).each do |method| define_method(method) do |*args| reset! unless @integration_session returning @integration_session.send(method, *args) do |