aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-03 12:48:24 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-03 12:48:24 +0000
commitcb4bd89741ace5026ce5e05573ce46dd3701f8d7 (patch)
tree336101a77e3cef4db21f733fa06b9f327984e3f4 /actionpack/lib
parent55692003d4a230e2fc666420ce94c3b98d098f30 (diff)
downloadrails-cb4bd89741ace5026ce5e05573ce46dd3701f8d7.tar.gz
rails-cb4bd89741ace5026ce5e05573ce46dd3701f8d7.tar.bz2
rails-cb4bd89741ace5026ce5e05573ce46dd3701f8d7.zip
Fixed assert_template nil will be true when no template was rendered #1565 [maceywj@telus.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1648 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/assertions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index 64b47c94da..b412b625ca 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -93,7 +93,7 @@ module Test #:nodoc:
msg = build_message(message, "expecting <?> but rendering with <?>", expected, rendered)
assert_block(msg) do
if expected.nil?
- @response.rendered_with_file?
+ !@response.rendered_with_file?
else
expected == rendered
end