Skip to content
Closed
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
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ nav_order: 6

## main

* Fix segfault when coverage of eval'd code is enabled with Rails 8.1 ERB templates and view annotations are disabled.

*Josh Adam*

* Add `protocol` parameter to `with_request_url` test helper to enable testing with HTTPS protocol.

*Joel Hawksley*
Expand Down
4 changes: 3 additions & 1 deletion lib/view_component/template.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,10 @@ def defined_on_self?
def compile_to_component
@component.silence_redefinition_of_method(call_method_name)

safe_lineno = coverage_running? && @lineno.to_i.negative? ? 1 : @lineno

# rubocop:disable Style/EvalWithLocation
@component.class_eval <<~RUBY, @path, @lineno
@component.class_eval <<~RUBY, @path, safe_lineno
def #{call_method_name}
#{compiled_source}
end
Expand Down
2 changes: 1 addition & 1 deletion test/sandbox/test/inline_template_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ class InlineComponentDerivedFromComponentSupportingVariants < Level2Component
def with_coverage_running
require "coverage"
already_running = Coverage.running?
Coverage.start unless already_running
Coverage.start(lines: true, branches: true, eval: true) unless already_running
yield
ensure
Coverage.result unless already_running
Expand Down