Revert "Revert "Name compiled render methods". This caused several failures on AP test suite for 1.9.2."
This reverts commit 9013227e00895ac95f29077229ec2fb156f450b0. minitest was 'running' compiled templates beginning with test!
This commit is contained in:
parent
caab176116
commit
7ea85ff516
@ -156,11 +156,12 @@ def counter_name
|
||||
end
|
||||
|
||||
def inspect
|
||||
if defined?(Rails.root)
|
||||
identifier.sub("#{Rails.root}/", '')
|
||||
else
|
||||
identifier
|
||||
end
|
||||
@inspect ||=
|
||||
if defined?(Rails.root)
|
||||
identifier.sub("#{Rails.root}/", '')
|
||||
else
|
||||
identifier
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
@ -267,9 +268,11 @@ def #{method_name}(local_assigns)
|
||||
end
|
||||
|
||||
def build_method_name(locals)
|
||||
# TODO: is locals.keys.hash reliably the same?
|
||||
@method_names[locals.keys.hash] ||=
|
||||
"_render_template_#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
|
||||
@method_names[locals.keys.hash] ||= "_#{identifier_method_name}__#{@identifier.hash}_#{__id__}_#{locals.keys.hash}".gsub('-', "_")
|
||||
end
|
||||
|
||||
def identifier_method_name
|
||||
@identifier_method_name ||= inspect.gsub(/[^a-z_]/, '_')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user