From d51a2ba82ed030142a93ce79c0e2fac2e3a7eb2f Mon Sep 17 00:00:00 2001
From: Jean Helou <soft@byjean.eu>
Date: Tue, 24 Aug 2010 14:31:01 +0200
Subject: [PATCH] rebase patch from Mike Gehard on rails 3-0-stable head

---
 actionpack/lib/action_controller/test_case.rb |   32 ++++++++++++++----------
 actionpack/test/controller/layout_test.rb     |    2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index e02fe20..494ca7e 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -89,19 +89,6 @@ module ActionController
                     "expecting ? to be rendered ? time(s) but rendered ? time(s)",
                      expected_partial, expected_count, actual_count)
             assert(actual_count == expected_count.to_i, msg)
-          elsif options.key?(:layout)
-            msg = build_message(message,
-                    "expecting layout <?> but action rendered <?>",
-                    expected_layout, @layouts.keys)
-
-            case layout = options[:layout]
-            when String
-              assert(@layouts.include?(expected_layout), msg)
-            when Regexp
-              assert(@layouts.any? {|l| l =~ layout }, msg)
-            when nil
-              assert(@layouts.empty?, msg)
-            end
           else
             msg = build_message(message,
                     "expecting partial <?> but action rendered <?>",
@@ -112,6 +99,25 @@ module ActionController
           assert @partials.empty?,
             "Expected no partials to be rendered"
         end
+        if expected_layout = options[:layout]
+          case expected_layout
+            when String
+              msg = build_message(message,
+                  "expecting layout <?> but action rendered layouts <?>",
+                  expected_layout, @layouts.keys)
+              assert(@layouts.include?(expected_layout), msg)
+            when Regexp
+              msg = build_message(message,
+                  "expecting layout to match <?> but action rendered layouts <?>",
+                  expected_layout, @layouts.keys)
+              assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
+            when nil
+              msg = build_message(message,
+                  "expecting no layout but action rendered layouts <?>",
+                  @layouts.keys)
+              assert(@layouts.empty?, msg)
+          end
+        end				
       end
     end
   end
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index 32a0f40..967a8f0 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -167,7 +167,7 @@ class LayoutSetInResponseTest < ActionController::TestCase
   def test_layout_is_picked_from_the_controller_instances_view_path
     @controller = PrependsViewPathController.new
     get :hello
-    assert_template :layout => /layouts\/alt\.\w+/
+    assert_template :layout => /layouts\/alt/
   end
 
   def test_absolute_pathed_layout
-- 
1.7.0.2.msysgit.0