aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
authorAlexey Vakhov <vakhov@gmail.com>2012-04-11 11:28:19 +0600
committerAlexey Vakhov <vakhov@gmail.com>2012-05-04 23:31:03 +0400
commitdf36c5f7ffd2657e11eea4e407401c9ff2aa0533 (patch)
tree02b4e4b059ff4491eb7b59e40e8e4358aa5f89d1 /actionpack/lib/action_controller/test_case.rb
parent9ce057d8ccc799eb4844494e3c6ee553969a66d3 (diff)
downloadrails-df36c5f7ffd2657e11eea4e407401c9ff2aa0533.tar.gz
rails-df36c5f7ffd2657e11eea4e407401c9ff2aa0533.tar.bz2
rails-df36c5f7ffd2657e11eea4e407401c9ff2aa0533.zip
Fix assert_template assertion with :layout option
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
1 files changed, 1 insertions, 1 deletions
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