diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-07 14:00:39 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-07 14:00:39 -0800 |
| commit | de4a60c9f468bb5bf4bd38220377cc5ac8385102 (patch) | |
| tree | 76d5fbe8eb154b277ec095fecb08033d5d993350 /actionpack/lib/action_view | |
| parent | c6839277a9262ea87329c719443cf19e33038f3f (diff) | |
| parent | 73deb3af23765882f67869afb4eaa8ad74a351d1 (diff) | |
| download | rails-de4a60c9f468bb5bf4bd38220377cc5ac8385102.tar.gz rails-de4a60c9f468bb5bf4bd38220377cc5ac8385102.tar.bz2 rails-de4a60c9f468bb5bf4bd38220377cc5ac8385102.zip | |
Merge pull request #9464 from jcoyne/assert_template_file
Allow use of assert_template with the :file option.
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/template.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/test_case.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index f73d14c79b..f5744aa6d4 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -138,7 +138,7 @@ module ActionView # we use a bang in this instrumentation because you don't want to # consume this in production. This is only slow if it's being listened to. def render(view, locals, buffer=nil, &block) - ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do + ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path, :identifier=>@identifier) do compile!(view) view.send(method_name, locals, buffer, &block) end diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb index 463f192d0c..10b487f37a 100644 --- a/actionpack/lib/action_view/test_case.rb +++ b/actionpack/lib/action_view/test_case.rb @@ -219,6 +219,7 @@ module ActionView :@_routes, :@controller, :@_layouts, + :@_files, :@_rendered_views, :@method_name, :@output_buffer, |