Delegate properly to custom Resolver instances

.travis.yml

@@ -114,3 +114,4 @@ branches:
   only:
     - master
     - /^\d+-\d+-maintenance$/
+    - fix_empty_view_rendering

example_app_generator/generate_app.rb

@@ -32,6 +32,8 @@
     |# Rack::Cache 1.3.0 requires Ruby >= 2.0.0
     |gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'
     |
+    |gem 'rake', '~> 10.0', '< 11'
+    |
     |gem 'rspec-rails',
     |    :path => '#{rspec_rails_repo_path}',
     |    :groups => [:development, :test]

lib/rspec/rails/view_rendering.rb

@@ -39,22 +39,18 @@ def render_views?
         self.class.render_views? || !controller.class.respond_to?(:view_paths)
       end
 
-      # Delegates find_all to the submitted path set and then returns templates
-      # with modified source
-      #
       # @private
-      class EmptyTemplateResolver < ::ActionView::FileSystemResolver
-
-        def initialize(path, pattern=nil)
-          unless path.is_a?(::ActionView::Resolver)
-            super
+      class EmptyTemplateResolver
+        def self.build(path)
+          if path.is_a?(::ActionView::Resolver)
+            ResolverDecorator.new(path)
+          else
+            FileSystemResolver.new(path)
           end
         end
 
-      private
-
-        def find_templates(*args)
-          super.map do |template|
+        def self.nullify_template_rendering(templates)
+          templates.map do |template|
             ::ActionView::Template.new(
               "",
               template.identifier,
@@ -64,6 +60,40 @@ def find_templates(*args)
             )
           end
         end
+
+        # Delegates find_templates to the submitted resolver and then returns templates
+        # with modified source
+        #
+        # @private
+        class ResolverDecorator
+          def initialize(resolver)
+            @resolver = resolver
+          end
+
+          def method_missing(name, *args, &block)
+            @resolver.send(name, *args, &block)
+          end
+
+        private
+
+          def find_templates(*args)
+            templates = @resolver.find_templates(*args)
+            EmptyTemplateResolver.nullify_template_rendering(templates)
+          end
+        end
+
+        # Delegates find_templates to the submitted path set and then returns
+        # templates with modified source
+        #
+        # @private
+        class FileSystemResolver < ::ActionView::FileSystemResolver
+        private
+
+          def find_templates(*args)
+            templates = super
+            EmptyTemplateResolver.nullify_template_rendering(templates)
+          end
+        end
       end
 
       # @private
@@ -88,13 +118,13 @@ def append_view_path(new_path)
       private
 
         def _path_decorator(*paths)
-          paths.map { |path| EmptyTemplateResolver.new(path) }
+          paths.map { |path| EmptyTemplateResolver.build(path) }
         end
       end
 
       # @private
       RESOLVER_CACHE = Hash.new do |hash, path|
-        hash[path] = EmptyTemplateResolver.new(path)
+        hash[path] = EmptyTemplateResolver.build(path)
       end
 
       included do

rspec-rails.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     end
   end
 
-  s.add_development_dependency 'rake',     '~> 10.0'
+  s.add_development_dependency 'rake',     '~> 10.0', '< 11'
   s.add_development_dependency 'cucumber', '~> 1.3.5'
   s.add_development_dependency 'aruba',    '~> 0.5.4'
   s.add_development_dependency 'ammeter',  '1.1.2'