diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-02-25 13:14:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 13:14:59 -0800 |
| commit | d1f68b50487ea1a8fc7f822973e2cc46d1288060 (patch) | |
| tree | 4d300572bd347f8c20e93933eff9b7186a8fc3b3 /actionview/lib/action_view/testing/resolvers.rb | |
| parent | 5330a342852147ecd65a16f83bc51e688c8bb9eb (diff) | |
| parent | 12ff6064d169366e554b11a25813d82701435253 (diff) | |
| download | rails-d1f68b50487ea1a8fc7f822973e2cc46d1288060.tar.gz rails-d1f68b50487ea1a8fc7f822973e2cc46d1288060.tar.bz2 rails-d1f68b50487ea1a8fc7f822973e2cc46d1288060.zip | |
Merge pull request #35404 from rails/no-nil-format-on-templates
No nil format on templates
Diffstat (limited to 'actionview/lib/action_view/testing/resolvers.rb')
| -rw-r--r-- | actionview/lib/action_view/testing/resolvers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb index d6203b95c5..275e2e9182 100644 --- a/actionview/lib/action_view/testing/resolvers.rb +++ b/actionview/lib/action_view/testing/resolvers.rb @@ -34,7 +34,7 @@ module ActionView #:nodoc: @hash.each do |_path, array| source, updated_at = array next unless query.match?(_path) - handler, format, variant = extract_handler_and_format_and_variant(_path) + handler, format, variant = extract_handler_and_format_and_variant(_path, :html) templates << Template.new(source, _path, handler, virtual_path: path.virtual, format: format, @@ -49,7 +49,7 @@ module ActionView #:nodoc: class NullResolver < PathResolver def query(path, exts, _, _) - handler, format, variant = extract_handler_and_format_and_variant(path) + handler, format, variant = extract_handler_and_format_and_variant(path, :html) [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, virtual_path: path.virtual, format: format, variant: variant)] end end |