diff options
author | Lachlan Sylvester <lachlan.sylvester@publicisfrontfoot.com.au> | 2018-08-07 13:17:01 +1000 |
---|---|---|
committer | Lachlan Sylvester <lachlan.sylvester@publicisfrontfoot.com.au> | 2018-08-07 16:10:00 +1000 |
commit | e69dfa478b8a174362a7afc49dc7b3cbafe19337 (patch) | |
tree | e6ea705552a03692548b48955c11a681569a64f5 /railties | |
parent | 79573b3afffafc070ec1eecf8c47678bbdae60c7 (diff) | |
download | rails-e69dfa478b8a174362a7afc49dc7b3cbafe19337.tar.gz rails-e69dfa478b8a174362a7afc49dc7b3cbafe19337.tar.bz2 rails-e69dfa478b8a174362a7afc49dc7b3cbafe19337.zip |
update BacktraceCleaner::RENDER_TEMPLATE_PATTERN to match the ActionView::Template method names
Diffstat (limited to 'railties')
-rw-r--r-- | railties/lib/rails/backtrace_cleaner.rb | 2 | ||||
-rw-r--r-- | railties/test/backtrace_cleaner_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb index ae8db0f8ef..0e78959966 100644 --- a/railties/lib/rails/backtrace_cleaner.rb +++ b/railties/lib/rails/backtrace_cleaner.rb @@ -5,7 +5,7 @@ require "active_support/backtrace_cleaner" module Rails class BacktraceCleaner < ActiveSupport::BacktraceCleaner APP_DIRS_PATTERN = /^\/?(app|config|lib|test|\(\w*\))/ - RENDER_TEMPLATE_PATTERN = /:in `_render_template_\w*'/ + RENDER_TEMPLATE_PATTERN = /:in `.*_\w+_{2,3}\d+_\d+'/ EMPTY_STRING = "".freeze SLASH = "/".freeze DOT_SLASH = "./".freeze diff --git a/railties/test/backtrace_cleaner_test.rb b/railties/test/backtrace_cleaner_test.rb index 4546e8f559..8490f9eb10 100644 --- a/railties/test/backtrace_cleaner_test.rb +++ b/railties/test/backtrace_cleaner_test.rb @@ -32,4 +32,11 @@ class BacktraceCleanerTest < ActiveSupport::TestCase assert_equal "(irb):1", result[0] assert_equal 1, result.length end + + test "should omit ActionView template methods names" do + method_name = ActionView::Template.new(nil, "app/views/application/index.html.erb", nil, {}).send :method_name + backtrace = [ "app/views/application/index.html.erb:4:in `block in #{method_name}'"] + result = @cleaner.clean(backtrace, :all) + assert_equal "app/views/application/index.html.erb:4", result[0] + end end |