Check first render format and extension. Fixes failing ActionMailer test.
This commit is contained in:
parent
26bc867151
commit
68fe898189
@ -313,7 +313,7 @@ def pick_template(template_path)
|
||||
template
|
||||
elsif template = self.view_paths[template_file_name]
|
||||
template
|
||||
elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.extension}"]
|
||||
elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.format_and_extension}"]
|
||||
template
|
||||
elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"]
|
||||
@template_format = :html
|
||||
|
Loading…
Reference in New Issue
Block a user