aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/activerecord/controller_runtime_test.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-05-07 20:16:42 +0200
committerGitHub <noreply@github.com>2017-05-07 20:16:42 +0200
commit45095a817b29f3b4956abce5d059410d591b902a (patch)
tree5bf7fc2271ddc5d4ed511db35893c2049142831b /actionview/test/activerecord/controller_runtime_test.rb
parentaf58740b8d943f90a18c3e7ceca9432775cfe192 (diff)
parentb201474756a2ee493406ad0cb49f49c6873bdc28 (diff)
downloadrails-45095a817b29f3b4956abce5d059410d591b902a.tar.gz
rails-45095a817b29f3b4956abce5d059410d591b902a.tar.bz2
rails-45095a817b29f3b4956abce5d059410d591b902a.zip
Merge pull request #29005 from kamipo/should_escape_meta_chars_in_regexp
Should escape meta characters in regexp
Diffstat (limited to 'actionview/test/activerecord/controller_runtime_test.rb')
-rw-r--r--actionview/test/activerecord/controller_runtime_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/test/activerecord/controller_runtime_test.rb b/actionview/test/activerecord/controller_runtime_test.rb
index 590559f592..1cec5072c0 100644
--- a/actionview/test/activerecord/controller_runtime_test.rb
+++ b/actionview/test/activerecord/controller_runtime_test.rb
@@ -67,7 +67,7 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase
wait
assert_equal 2, @logger.logged(:info).size
- assert_match(/\(Views: [\d.]+ms \| ActiveRecord: 0.0ms\)/, @logger.logged(:info)[1])
+ assert_match(/\(Views: [\d.]+ms \| ActiveRecord: 0\.0ms\)/, @logger.logged(:info)[1])
end
def test_log_with_active_record_when_post