Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/rails/controller/testing.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
require 'rails/controller/testing/test_process'
require 'rails/controller/testing/integration'
require 'rails/controller/testing/template_assertions'
require 'rails/controller/testing/instrument_determine_template'

module Rails
module Controller
Expand All @@ -18,6 +19,12 @@ def self.install
include Rails::Controller::Testing::TestProcess
end

if ActiveSupport::VERSION::MAJOR >= 6
ActiveSupport.on_load(:action_view) do
ActionView::TemplateRenderer.prepend(InstrumentDetermineTemplate)
end
end

ActiveSupport.on_load(:action_view_test_case) do
include Rails::Controller::Testing::TemplateAssertions
end
Expand Down
18 changes: 18 additions & 0 deletions lib/rails/controller/testing/instrument_determine_template.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module Rails
module Controller
module Testing
module InstrumentDetermineTemplate
def determine_template(options)
super.tap do |template|
if template.is_a?(ActionView::Template::RawFile)
ActiveSupport::Notifications.instrument(
"!render_template.action_view",
{ virtual_path: nil, identifier: template.identifier }
)
end
end
end
end
end
end
end