Merge branch 'master' of git://github.com/lifo/docrails

1 files changed, 8 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/testing/resolvers.rb b/actionpack/lib/action_view/testing/resolvers.rb
index b2b62528a9..55583096e0 100644
--- a/actionpack/lib/action_view/testing/resolvers.rb
+++ b/actionpack/lib/action_view/testing/resolvers.rb
@@ -13,26 +13,29 @@ module ActionView #:nodoc:
       @hash = hash
     end
 
-  private
+    private
 
     def query(path, exts, formats)
-      query = Regexp.escape(path)
+      query = ""
       exts.each do |ext|
         query << '(' << ext.map {|e| e && Regexp.escape(".#{e}") }.join('|') << '|)'
       end
+      query = /^(#{Regexp.escape(path)})#{query}$/
 
       templates = []
-      @hash.select { |k,v| k =~ /^#{query}$/ }.each do |_path, source|
+      @hash.each do |_path, array|
+        source, updated_at = array
+        next unless _path =~ query
         handler, format = extract_handler_and_format(_path, formats)
         templates << Template.new(source, _path, handler,
-          :virtual_path => _path, :format => format)
+          :virtual_path => $1, :format => format, :updated_at => updated_at)
       end
 
       templates.sort_by {|t| -t.identifier.match(/^#{query}$/).captures.reject(&:blank?).size }
     end
   end
 
-  class NullResolver < ActionView::PathResolver
+  class NullResolver < PathResolver
     def query(path, exts, formats)
       handler, format = extract_handler_and_format(path, formats)
       [ActionView::Template.new("Template generated by Null Resolver", path, handler, :virtual_path => path, :format => format)]