aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/rack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-09-26 15:08:25 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-09-27 10:46:50 -0700
commit35a17502b6054ab6d6407c0af902a441e8ae8215 (patch)
tree0e02ee478a91c2dfd5e99ef82ec8898b2528349b /railties/test/application/rack
parent20f5f08d3b4df0f31099378c8178a9a78db52419 (diff)
downloadrails-35a17502b6054ab6d6407c0af902a441e8ae8215.tar.gz
rails-35a17502b6054ab6d6407c0af902a441e8ae8215.tar.bz2
rails-35a17502b6054ab6d6407c0af902a441e8ae8215.zip
Tune up Rails::Rack::Logger. Only put space between requests in development logs.
Conflicts: railties/test/application/rack/logger_test.rb
Diffstat (limited to 'railties/test/application/rack')
-rw-r--r--railties/test/application/rack/logger_test.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 387eb25525..1e134083db 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -21,25 +21,25 @@ module ApplicationTests
end
def logs
- @logs ||= @logger.logged(:info)
+ @logs ||= @logger.logged(:info).join("\n")
end
test "logger logs proper HTTP verb and path" do
get "/blah"
wait
- assert_match(/^Started GET "\/blah"/, logs[0])
+ assert_match 'Started GET "/blah"', logs
end
test "logger logs HTTP verb override" do
- post "/", {:_method => 'put'}
+ post "/", _method: 'put'
wait
- assert_match(/^Started PUT "\/"/, logs[0])
+ assert_match 'Started PUT "/"', logs
end
test "logger logs HEAD requests" do
- post "/", {:_method => 'head'}
+ post "/", _method: 'head'
wait
- assert_match(/^Started HEAD "\/"/, logs[0])
+ assert_match 'Started HEAD "/"', logs
end
end
end