aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/request/json_params_parsing_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-01-05 12:03:10 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-01-05 12:03:10 -0800
commit013d959917a3f682f921dc6af726fa2136285bed (patch)
treed1efcdbf5bfa347a5fbb436d4db61f962382d8a2 /actionpack/test/dispatch/request/json_params_parsing_test.rb
parent4d08324aac7a50bbaa8f6200f50e8a7f6ff3ce48 (diff)
parent00236435221a39441af3f1e76110767fba4154a8 (diff)
downloadrails-013d959917a3f682f921dc6af726fa2136285bed.tar.gz
rails-013d959917a3f682f921dc6af726fa2136285bed.tar.bz2
rails-013d959917a3f682f921dc6af726fa2136285bed.zip
Merge pull request #4303 from Karunakar/logger
Moved the logger methods in activeresource/test/abstract_unit.rb
Diffstat (limited to 'actionpack/test/dispatch/request/json_params_parsing_test.rb')
-rw-r--r--actionpack/test/dispatch/request/json_params_parsing_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index ad44b4b16a..ae425dd406 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -34,7 +34,7 @@ class JsonParamsParsingTest < ActionDispatch::IntegrationTest
with_test_routing do
output = StringIO.new
json = "[\"person]\": {\"name\": \"David\"}}"
- post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => Logger.new(output)}
+ post "/parse", json, {'CONTENT_TYPE' => 'application/json', 'action_dispatch.show_exceptions' => true, 'action_dispatch.logger' => ActiveSupport::Logger.new(output)}
assert_response :error
output.rewind && err = output.read
assert err =~ /Error occurred while parsing request parameters/