diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 14:52:30 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 14:52:30 -0700 |
| commit | e8d73dd18a459dc4beed31787303efe64365451d (patch) | |
| tree | 4fe2f0da9d494194a6914b7e36dac6d311be81fd /actionview/lib/action_view | |
| parent | 8404ed6408e17efda09bf568e79eba36858be5d9 (diff) | |
| parent | 7a191ffe44b9a0f08489b95cfb58f18ac8c641d6 (diff) | |
| download | rails-e8d73dd18a459dc4beed31787303efe64365451d.tar.gz rails-e8d73dd18a459dc4beed31787303efe64365451d.tar.bz2 rails-e8d73dd18a459dc4beed31787303efe64365451d.zip | |
Merge pull request #17013 from gsamokovarov/fix-null-resolver
Fix improper value types used to instantiate a Template in AV::NullResol...
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/testing/resolvers.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionview/lib/action_view/testing/resolvers.rb b/actionview/lib/action_view/testing/resolvers.rb index dfb7d463b4..63a60542d4 100644 --- a/actionview/lib/action_view/testing/resolvers.rb +++ b/actionview/lib/action_view/testing/resolvers.rb @@ -46,9 +46,8 @@ module ActionView #:nodoc: class NullResolver < PathResolver def query(path, exts, formats) handler, format, variant = extract_handler_and_format_and_variant(path, formats) - [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format, :variant => variant)] + [ActionView::Template.new("Template generated by Null Resolver", path.virtual, handler, :virtual_path => path.virtual, :format => format, :variant => variant)] end end - end |