Skip to content
Browse files

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
  • Loading branch information...
1 parent 5569200 commit cb4bd89741ace5026ce5e05573ce46dd3701f8d7 @dhh dhh committed Jul 3, 2005
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +1 −1 actionpack/lib/action_controller/assertions.rb
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed assert_template nil will be true when no template was rendered #1565 [maceywj@telus.net]
+
* Added :prompt option to FormOptions#select (and the users of it, like FormOptions#select_country etc) to create "Please select" style descriptors #1181 [Michael Schuerig]
* Added JavascriptHelper#update_element_function, which returns a Javascript function (or expression) that'll update a DOM element according to the options passed #933 [mortonda@dgrmm.net]. Examples:
View
2 actionpack/lib/action_controller/assertions.rb
@@ -93,7 +93,7 @@ def assert_template(expected = nil, message=nil)
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

0 comments on commit cb4bd89

Please sign in to comment.
Something went wrong with that request. Please try again.