From df36c5f7ffd2657e11eea4e407401c9ff2aa0533 Mon Sep 17 00:00:00 2001 From: Alexey Vakhov Date: Wed, 11 Apr 2012 11:28:19 +0600 Subject: Fix assert_template assertion with :layout option --- actionpack/lib/action_controller/test_case.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/test_case.rb') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 21997c4d79..aee54bf515 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -120,7 +120,7 @@ module ActionController options[:partial], @partials.keys) assert_includes @partials, expected_partial, msg end - else + elsif options.key?(:partial) assert @partials.empty?, "Expected no partials to be rendered" end -- cgit v1.2.3