mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
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
This commit is contained in:
parent
55692003d4
commit
cb4bd89741
2 changed files with 3 additions and 1 deletions
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue