aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorTom Ward <tom@popdog.net>2011-05-14 10:25:08 +0100
committerTom Ward <tom@popdog.net>2011-05-14 10:39:01 +0100
commit518ffcd168776cfaaae49faad9650621b32f148e (patch)
tree12358146b5a6b02b79fbee6f938d52317fb51def /actionpack
parentd49113023676fbf0b6653730f5bde759990caede (diff)
downloadrails-518ffcd168776cfaaae49faad9650621b32f148e.tar.gz
rails-518ffcd168776cfaaae49faad9650621b32f148e.tar.bz2
rails-518ffcd168776cfaaae49faad9650621b32f148e.zip
Escape regex in controller_runtime_test to actually check that the ActiveRecord message appears
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/activerecord/controller_runtime_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb
index 7931da3741..c030315d2b 100644
--- a/actionpack/test/activerecord/controller_runtime_test.rb
+++ b/actionpack/test/activerecord/controller_runtime_test.rb
@@ -37,6 +37,6 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase
wait
assert_equal 2, @logger.logged(:info).size
- assert_match(/\(Views: [\d.]+ms | ActiveRecord: [\d.]+ms\)/, @logger.logged(:info)[1])
+ assert_match(/\(Views: [\d.]+ms \| ActiveRecord: [\d.]+ms\)/, @logger.logged(:info)[1])
end
end