0
@@ -183,30 +183,21 @@ module Spec
0
               unless integrate_views?
0
                 if @template.respond_to?(:finder)
0
                   (class << @template.finder; self; end).class_eval do
0
-                    define_method :file_exists? do
0
-                      true
0
-                    end
0
+                    define_method :file_exists? do; true; end
0
                   end
0
                 else
0
                   (class << @template; self; end).class_eval do
0
-                    define_method :file_exists? do
0
-                      true
0
-                    end
0
+                    define_method :file_exists? do; true; end
0
                   end
0
                 end
0
                 (class << @template; self; end).class_eval do
0
                   define_method :render_file do |*args|
0
-                    @first_render ||= args[0] 
0
+                    @first_render ||= args[0] unless args[0] =~ /^layouts/
0
                   end
0
                   
0
                   define_method :pick_template do |*args|
0
-                    @_first_render = args[0]
0
-                    Class.new do
0
-                      def render_template(*ignore_args)
0
-                      end
0
-                      def render_partial(*ignore_args)
0
-                      end
0
-                    end.new
0
+                    @_first_render ||= args[0] unless args[0] =~ /^layouts/
0
+                    PickedTemplate.new
0
                   end
0
                 end
0
               end
0
@@ -278,6 +269,11 @@ module Spec
0
 
0
         Spec::Example::ExampleGroupFactory.register(:controller, self)
0
       end
0
+      
0
+      class PickedTemplate
0
+        def render_template(*ignore_args); end
0
+        def render_partial(*ignore_args);  end
0
+      end
0
     end
0
   end
0
 end

0
@@ -10,19 +10,16 @@ module Spec
0
         end
0
       
0
         def matches?(response)
0
+          
0
           if response.respond_to?(:rendered_file)
0
             @actual = response.rendered_file
0
-            full_path(@actual) == full_path(@expected)
0
           else
0
             @actual = response.rendered_template.to_s
0
-            if @expected =~ /\//
0
-              given_controller_path, given_file = path_and_file(@actual)
0
-              expected_controller_path, expected_file = path_and_file(@expected)
0
-              given_controller_path == expected_controller_path && given_file.match(expected_file)
0
-            else
0
-              current_controller_path == controller_path_from(@actual) && @actual.match(@expected)
0
-            end
0
           end
0
+          return false if @actual.blank?
0
+          given_controller_path, given_file = path_and_file(@actual)
0
+          expected_controller_path, expected_file = path_and_file(@expected)
0
+          given_controller_path == expected_controller_path && given_file.match(expected_file)
0
         end
0
         
0
         def failure_message
0
@@ -41,7 +38,8 @@ module Spec
0
           def path_and_file(path)
0
             parts = path.split('/')
0
             file = parts.pop
0
-            return parts.join('/'), file
0
+            controller = parts.empty? ? current_controller_path : parts.join('/')
0
+            return controller, file
0
           end
0
         
0
           def controller_path_from(path)
0
@@ -50,11 +48,6 @@ module Spec
0
             parts.join('/')
0
           end
0
 
0
-          def full_path(path)
0
-            return nil if path.nil?
0
-            path.include?('/') ? path : "#{current_controller_path}/#{path}"
0
-          end
0
-        
0
           def current_controller_path
0
             @controller.class.to_s.underscore.gsub(/_controller$/,'')
0
           end

0
@@ -23,4 +23,8 @@ class RenderSpecController < ApplicationController
0
   def action_that_renders_nothing
0
     render :nothing => true
0
   end
0
+  
0
+  def action_with_alternate_layout
0
+    render :layout => 'simple'
0
+  end
0
 end