aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/activerecord/controller_runtime_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-13 23:19:11 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-14 01:07:03 +0100
commitf921ad5c97048c692859b395bc78245a343bf833 (patch)
tree6eec831da1283ac59627a172c908276573b02f54 /actionpack/test/activerecord/controller_runtime_test.rb
parent116df09c3e4a57a6b0a57a5134c451687113ece1 (diff)
downloadrails-f921ad5c97048c692859b395bc78245a343bf833.tar.gz
rails-f921ad5c97048c692859b395bc78245a343bf833.tar.bz2
rails-f921ad5c97048c692859b395bc78245a343bf833.zip
Tidy up ActiveRecord and Views runtime information on process action logger.
Diffstat (limited to 'actionpack/test/activerecord/controller_runtime_test.rb')
-rw-r--r--actionpack/test/activerecord/controller_runtime_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index 6c9a24a760..37c7738301 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -37,8 +37,8 @@ module ControllerRuntimeSubscriberTest
get :show
wait
- assert_equal 4, @logger.logged(:info).size
- assert_match /ActiveRecord runtime/, @logger.logged(:info)[2]
+ assert_equal 2, @logger.logged(:info).size
+ assert_match /\(Views: [\d\.]+ms | ActiveRecord: [\d\.]+ms\)/, @logger.logged(:info)[1]
end
class SyncSubscriberTest < ActionController::TestCase