aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/testing/resolvers.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/testing/resolvers.rb')
-rw-r--r--actionpack/lib/action_view/testing/resolvers.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/testing/resolvers.rb b/actionpack/lib/action_view/testing/resolvers.rb
index 7afa2fa613..d552151a1d 100644
--- a/actionpack/lib/action_view/testing/resolvers.rb
+++ b/actionpack/lib/action_view/testing/resolvers.rb
@@ -19,7 +19,7 @@ module ActionView #:nodoc:
private
- def query(path, exts, formats)
+ def query(path, exts, formats, outside_app_allowed)
query = ""
EXTENSIONS.each do |ext|
query << '(' << exts[ext].map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
@@ -40,11 +40,10 @@ module ActionView #:nodoc:
end
class NullResolver < PathResolver
- def query(path, exts, formats)
+ def query(path, exts, formats, outside_app_allowed)
handler, format = extract_handler_and_format(path, formats)
[ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format)]
end
end
end
-